From ea5a0918c8c32309821ab239c4b95f4d6a3b5c12 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Thu, 2 Jun 2022 22:42:20 +0200 Subject: VCL add vcl::WindowPosSize abstract class ... and use it to remove a duplicate and simplify code. Should mostly be a refactoring, which was mainly done by some larger sed calls, except for the new API calls, which helped shrinking some LOC. All data is also now private. Originally two of the "replaced" "classes" had unsigned width and height and one had signed. Noel pointed out, that during calculations, the value might get negative temporarly, so this now settles with signed values. Still the set size should never be negative and this is enforced this way. Not sure that is what Noel had in mind. This also includes: - rename WindowState => WindowData - rename WindowStateMask => WindowDataMask - rename WindowStateState => WindowState - move WindowState and WindowDataMask to vcl/windowstate.hxx - move WindowData(Mask) and WindowState into vcl namespace - readability: replace or'ed WindowState enums with "meta" enums + add "meta" WindowState enums PosSize and PosSizeState Change-Id: Icd16cfb498531aa7238ddbde83fcb0ed6d9e4f77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135426 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- vcl/inc/osx/salframe.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/inc/osx') diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 47f8e62981b8..953a17adbcc9 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -126,8 +126,8 @@ public: virtual void GetClientSize( tools::Long& rWidth, tools::Long& rHeight ) override; virtual void GetWorkArea( tools::Rectangle& rRect ) override; virtual SalFrame* GetParent() const override; - virtual void SetWindowState( const SalFrameState* pState ) override; - virtual bool GetWindowState( SalFrameState* pState ) override; + virtual void SetWindowState(const vcl::WindowData*) override; + virtual bool GetWindowState(vcl::WindowData*) override; virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) override; virtual void StartPresentation( bool bStart ) override; virtual void SetAlwaysOnTop( bool bOnTop ) override; -- cgit