[Libreoffice-commits] core.git: cui/source framework/source include/vcl reportdesign/source sfx2/source vcl/headless vcl/inc vcl/osx vcl/source vcl/unx vcl/win
Noel Grandin
noel at peralex.com
Tue May 10 06:40:58 UTC 2016
cui/source/dialogs/iconcdlg.cxx | 2
framework/source/helper/persistentwindowstate.cxx | 3
framework/source/uiconfiguration/windowstateconfiguration.cxx | 2
include/vcl/syswin.hxx | 43 ++-
reportdesign/source/ui/dlg/Formula.cxx | 2
sfx2/source/appl/childwin.cxx | 4
sfx2/source/dialog/basedlgs.cxx | 10
sfx2/source/dialog/srchdlg.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 2
vcl/headless/svpframe.cxx | 14 -
vcl/inc/salwtype.hxx | 3
vcl/osx/salframe.cxx | 22 -
vcl/source/window/dockwin.cxx | 4
vcl/source/window/syswin.cxx | 114 +++++-----
vcl/source/window/wrkwin.cxx | 2
vcl/unx/generic/window/salframe.cxx | 22 -
vcl/unx/gtk/gtksalframe.cxx | 44 +--
vcl/unx/gtk3/gtk3gtkframe.cxx | 44 +--
vcl/win/window/salframe.cxx | 16 -
19 files changed, 180 insertions(+), 175 deletions(-)
New commits:
commit 9c7222c11c331ecd1562e963e78ab85be75b8e49
Author: Noel Grandin <noel at peralex.com>
Date: Mon May 9 16:31:21 2016 +0200
convert WINDOWSTATE_MASK to scoped enum
Change-Id: Ic8259d81d8080c518aa07697e253a59cd6efaa4b
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 1ce8a53..6a22c26 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -217,7 +217,7 @@ void IconChoiceDialog::dispose()
// save configuration at INI-Manager
// and remove pages
//SvtViewOptions aTabDlgOpt( E_TABDIALOG, rId );
- //aTabDlgOpt.SetWindowState(OStringToOUString(GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US));
+ //aTabDlgOpt.SetWindowState(OStringToOUString(GetWindowState((WindowStateMask::X | WindowStateMask::Y | WindowStateMask::State | WindowStateMask::Minimized)), RTL_TEXTENCODING_ASCII_US));
//aTabDlgOpt.SetPageID( mnCurrentPageId );
for (IconChoicePageData* pData : maPageList)
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index c4fbaf0..6938cc2 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -220,8 +220,7 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::
(pWindow->IsSystemWindow())
)
{
- sal_uLong nMask = WINDOWSTATE_MASK_ALL;
- nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
+ WindowStateMask nMask = WindowStateMask::All & ~(WindowStateMask::Minimized);
sWindowState = OStringToOUString(
static_cast<SystemWindow*>(pWindow)->GetWindowState(nMask),
RTL_TEXTENCODING_UTF8);
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index aef7823..72b7c84 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -56,8 +56,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::ui;
using namespace framework;
-#undef WINDOWSTATE_MASK_POS
-
namespace {
// Zero based indexes, order must be the same as WindowStateMask && CONFIGURATION_PROPERTIES!
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 49f7c89..a85ede9 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -26,6 +26,7 @@
#include <vcl/idle.hxx>
#include <vcl/notebookbar.hxx>
#include <vcl/window.hxx>
+#include <o3tl/typed_flags_set.hxx>
class ModalDialog;
class MenuBar;
@@ -42,19 +43,25 @@ class VclContainer;
#define ICON_MATH_DOCUMENT 13
#define ICON_MACROLIBRARY 1
-
-#define WINDOWSTATE_MASK_X ((sal_uInt32)0x00000001)
-#define WINDOWSTATE_MASK_Y ((sal_uInt32)0x00000002)
-#define WINDOWSTATE_MASK_WIDTH ((sal_uInt32)0x00000004)
-#define WINDOWSTATE_MASK_HEIGHT ((sal_uInt32)0x00000008)
-#define WINDOWSTATE_MASK_STATE ((sal_uInt32)0x00000010)
-#define WINDOWSTATE_MASK_MINIMIZED ((sal_uInt32)0x00000020)
-#define WINDOWSTATE_MASK_MAXIMIZED_X ((sal_uInt32)0x00000100)
-#define WINDOWSTATE_MASK_MAXIMIZED_Y ((sal_uInt32)0x00000200)
-#define WINDOWSTATE_MASK_MAXIMIZED_WIDTH ((sal_uInt32)0x00000400)
-#define WINDOWSTATE_MASK_MAXIMIZED_HEIGHT ((sal_uInt32)0x00000800)
-#define WINDOWSTATE_MASK_POS (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y)
-#define WINDOWSTATE_MASK_ALL (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT | WINDOWSTATE_MASK_MAXIMIZED_X | WINDOWSTATE_MASK_MAXIMIZED_Y | WINDOWSTATE_MASK_MAXIMIZED_WIDTH | WINDOWSTATE_MASK_MAXIMIZED_HEIGHT | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)
+enum class WindowStateMask {
+ NONE = 0x0000,
+ X = 0x0001,
+ Y = 0x0002,
+ Width = 0x0004,
+ Height = 0x0008,
+ State = 0x0010,
+ Minimized = 0x0020,
+ MaximizedX = 0x0100,
+ MaximizedY = 0x0200,
+ MaximizedWidth = 0x0400,
+ MaximizedHeight = 0x0800,
+ Pos = X | Y,
+ All = X | Y | Width | Height | MaximizedX | MaximizedY | MaximizedWidth | MaximizedHeight | State | Minimized
+};
+namespace o3tl
+{
+ template<> struct typed_flags<WindowStateMask> : is_typed_flags<WindowStateMask, 0x0f3f> {};
+}
#define WINDOWSTATE_STATE_NORMAL ((sal_uInt32)0x00000001)
#define WINDOWSTATE_STATE_MINIMIZED ((sal_uInt32)0x00000002)
@@ -67,7 +74,7 @@ class VclContainer;
class VCL_PLUGIN_PUBLIC WindowStateData
{
private:
- sal_uInt32 mnValidMask;
+ WindowStateMask mnValidMask;
int mnX;
int mnY;
unsigned int mnWidth;
@@ -80,7 +87,7 @@ private:
public:
WindowStateData()
- : mnValidMask(0)
+ : mnValidMask(WindowStateMask::NONE)
, mnX(0)
, mnY(0)
, mnWidth(0)
@@ -93,8 +100,8 @@ public:
{
}
- void SetMask( sal_uInt32 nValidMask ) { mnValidMask = nValidMask; }
- sal_uInt32 GetMask() const { return mnValidMask; }
+ void SetMask( WindowStateMask nValidMask ) { mnValidMask = nValidMask; }
+ WindowStateMask GetMask() const { return mnValidMask; }
void SetX( int nX ) { mnX = nX; }
int GetX() const { return mnX; }
@@ -222,7 +229,7 @@ public:
const Size& GetMaxOutputSizePixel() const;
void SetWindowState(const OString& rStr);
- OString GetWindowState(sal_uInt32 nMask = WINDOWSTATE_MASK_ALL) const;
+ OString GetWindowState(WindowStateMask nMask = WindowStateMask::All) const;
void SetMenuBar(MenuBar* pMenuBar);
MenuBar* GetMenuBar() const { return mpMenuBar; }
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 16900c4..2b75a58 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -95,7 +95,7 @@ void FormulaDialog::dispose()
if ( m_pAddField )
{
SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) );
- aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US));
+ aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState((WindowStateMask::X | WindowStateMask::Y | WindowStateMask::State | WindowStateMask::Minimized)), RTL_TEXTENCODING_ASCII_US));
}
StoreFormEditData( m_pFormulaData );
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index ace65aa..25f58f9 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -338,9 +338,9 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
aInfo.aSize = pWindow->GetSizePixel();
if ( pWindow->IsSystemWindow() )
{
- sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
+ WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
if ( pWindow->GetStyle() & WB_SIZEABLE )
- nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT );
+ nMask |= ( WindowStateMask::Width | WindowStateMask::Height );
aInfo.aWinState = static_cast<SystemWindow*>(pWindow.get())->GetWindowState( nMask );
}
else if (DockingWindow* pDockingWindow = dynamic_cast<DockingWindow*>(pWindow.get()))
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 84dff54..37bef85 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -116,7 +116,7 @@ void SfxModalDialog::SetDialogData_Impl()
SvtViewOptions aDlgOpt(E_DIALOG, sConfigId);
aDlgOpt.SetWindowState(OStringToOUString(
- GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US));
+ GetWindowState(WindowStateMask::Pos), RTL_TEXTENCODING_ASCII_US));
if ( !aExtraData.isEmpty() )
aDlgOpt.SetUserItem( USERITEM_NAME, makeAny( aExtraData ) );
}
@@ -296,9 +296,9 @@ IMPL_LINK_NOARG_TYPED(SfxModelessDialog, TimerHdl, Idle *, void)
{
if ( !IsRollUp() )
aSize = GetSizePixel();
- sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
+ WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
if ( GetStyle() & WB_SIZEABLE )
- nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT );
+ nMask |= ( WindowStateMask::Width | WindowStateMask::Height );
pImp->aWinState = GetWindowState( nMask );
GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, pImp->pMgr->GetType() );
}
@@ -558,9 +558,9 @@ IMPL_LINK_NOARG_TYPED(SfxFloatingWindow, TimerHdl, Idle *, void)
{
if ( !IsRollUp() )
aSize = GetSizePixel();
- sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
+ WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
if ( GetStyle() & WB_SIZEABLE )
- nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT );
+ nMask |= ( WindowStateMask::Width | WindowStateMask::Height );
pImp->aWinState = GetWindowState( nMask );
GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, pImp->pMgr->GetType() );
}
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 1c4a139..d108cf5 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -171,7 +171,7 @@ void SearchDialog::Move()
{
ModelessDialog::Move();
if ( m_bIsConstructed && IsReallyVisible() )
- m_sWinState = GetWindowState( WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE );
+ m_sWinState = GetWindowState( WindowStateMask::Pos | WindowStateMask::State );
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 6e51edb..9515435 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -737,7 +737,7 @@ void SfxTabDialog::SavePosAndId()
{
// save settings (screen position and current page)
SvtViewOptions aDlgOpt(E_TABDIALOG, OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8));
- aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
+ aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WindowStateMask::Pos),RTL_TEXTENCODING_ASCII_US));
// to-do replace with name of page when all pages are converted to .ui
aDlgOpt.SetPageID( m_pTabCtrl->GetCurPageId() );
}
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 8003572..ee6d588 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -306,8 +306,8 @@ SalFrame* SvpSalFrame::GetParent() const
}
#define FRAMESTATE_MASK_GEOMETRY \
- (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | \
- WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT)
+ (WindowStateMask::X | WindowStateMask::Y | \
+ WindowStateMask::Width | WindowStateMask::Height)
void SvpSalFrame::SetWindowState( const SalFrameState *pState )
{
@@ -323,13 +323,13 @@ void SvpSalFrame::SetWindowState( const SalFrameState *pState )
long nHeight = maGeometry.nHeight;
// change requested properties
- if (pState->mnMask & WINDOWSTATE_MASK_X)
+ if (pState->mnMask & WindowStateMask::X)
nX = pState->mnX;
- if (pState->mnMask & WINDOWSTATE_MASK_Y)
+ if (pState->mnMask & WindowStateMask::Y)
nY = pState->mnY;
- if (pState->mnMask & WINDOWSTATE_MASK_WIDTH)
+ if (pState->mnMask & WindowStateMask::Width)
nWidth = pState->mnWidth;
- if (pState->mnMask & WINDOWSTATE_MASK_HEIGHT)
+ if (pState->mnMask & WindowStateMask::Height)
nHeight = pState->mnHeight;
SetPosSize( nX, nY, nWidth, nHeight,
@@ -345,7 +345,7 @@ bool SvpSalFrame::GetWindowState( SalFrameState* pState )
pState->mnY = maGeometry.nY;
pState->mnWidth = maGeometry.nWidth;
pState->mnHeight = maGeometry.nHeight;
- pState->mnMask = FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE;
+ pState->mnMask = FRAMESTATE_MASK_GEOMETRY | WindowStateMask::State;
return true;
}
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 155d2f9..2fffde7 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -31,6 +31,7 @@ namespace vcl { class Window; }
class FontSelectPattern;
enum class InputContextFlags;
+enum class WindowStateMask;
#define SALEVENT_MOUSEMOVE ((sal_uInt16)1)
#define SALEVENT_MOUSELEAVE ((sal_uInt16)2)
@@ -224,7 +225,7 @@ typedef long (*SALOBJECTPROC)( void* pInst, SalObject* pObject,
struct SalFrameState
{
- sal_uLong mnMask;
+ WindowStateMask mnMask;
long mnX;
long mnY;
long mnWidth;
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 832d132..0d535dc 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -539,13 +539,13 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
NSRect aStateRect = [mpNSWindow frame];
aStateRect = [NSWindow contentRectForFrameRect: aStateRect styleMask: mnStyleMask];
CocoaToVCL( aStateRect );
- if( pState->mnMask & WINDOWSTATE_MASK_X )
+ if( pState->mnMask & WindowStateMask::X )
aStateRect.origin.x = float(pState->mnX);
- if( pState->mnMask & WINDOWSTATE_MASK_Y )
+ if( pState->mnMask & WindowStateMask::Y )
aStateRect.origin.y = float(pState->mnY);
- if( pState->mnMask & WINDOWSTATE_MASK_WIDTH )
+ if( pState->mnMask & WindowStateMask::Width )
aStateRect.size.width = float(pState->mnWidth);
- if( pState->mnMask & WINDOWSTATE_MASK_HEIGHT )
+ if( pState->mnMask & WindowStateMask::Height )
aStateRect.size.height = float(pState->mnHeight);
VCLToCocoa( aStateRect );
aStateRect = [NSWindow frameRectForContentRect: aStateRect styleMask: mnStyleMask];
@@ -576,13 +576,13 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
UpdateFrameGeometry();
sal_uInt16 nEvent = 0;
- if( pState->mnMask & (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y) )
+ if( pState->mnMask & (WindowStateMask::X | WindowStateMask::Y) )
{
mbPositioned = true;
nEvent = SALEVENT_MOVE;
}
- if( pState->mnMask & (WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT) )
+ if( pState->mnMask & (WindowStateMask::Width | WindowStateMask::Height) )
{
mbSized = true;
nEvent = (nEvent == SALEVENT_MOVE) ? SALEVENT_MOVERESIZE : SALEVENT_RESIZE;
@@ -609,11 +609,11 @@ bool AquaSalFrame::GetWindowState( SalFrameState* pState )
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
- pState->mnMask = WINDOWSTATE_MASK_X |
- WINDOWSTATE_MASK_Y |
- WINDOWSTATE_MASK_WIDTH |
- WINDOWSTATE_MASK_HEIGHT |
- WINDOWSTATE_MASK_STATE;
+ pState->mnMask = WindowStateMask::X |
+ WindowStateMask::Y |
+ WindowStateMask::Width |
+ WindowStateMask::Height |
+ WindowStateMask::State;
NSRect aStateRect = [mpNSWindow frame];
aStateRect = [NSWindow contentRectForFrameRect: aStateRect styleMask: mnStyleMask];
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 84322a9..aad8795 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -1020,7 +1020,7 @@ Point DockingWindow::GetFloatingPos() const
if ( pWrapper->mpFloatWin )
{
WindowStateData aData;
- aData.SetMask( WINDOWSTATE_MASK_POS );
+ aData.SetMask( WindowStateMask::Pos );
pWrapper->mpFloatWin->GetWindowStateData( aData );
Point aPos( aData.GetX(), aData.GetY() );
aPos = pWrapper->mpFloatWin->GetParent()->ImplGetFrameWindow()->AbsoluteScreenToOutputPixel( aPos );
@@ -1033,7 +1033,7 @@ Point DockingWindow::GetFloatingPos() const
if ( mpFloatWin )
{
WindowStateData aData;
- aData.SetMask( WINDOWSTATE_MASK_POS );
+ aData.SetMask( WindowStateMask::Pos );
mpFloatWin->GetWindowStateData( aData );
Point aPos( aData.GetX(), aData.GetY() );
aPos = mpFloatWin->GetParent()->ImplGetFrameWindow()->AbsoluteScreenToOutputPixel( aPos );
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 02b15da..5a6effb 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -406,7 +406,7 @@ const Size& SystemWindow::GetMaxOutputSizePixel() const
static void ImplWindowStateFromStr(WindowStateData& rData,
const OString& rStr)
{
- sal_uInt32 nValidMask = 0;
+ WindowStateMask nValidMask = WindowStateMask::NONE;
sal_Int32 nIndex = 0;
OString aTokenStr;
@@ -415,7 +415,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
{
rData.SetX(aTokenStr.toInt32());
if( rData.GetX() > -16384 && rData.GetX() < 16384 )
- nValidMask |= WINDOWSTATE_MASK_X;
+ nValidMask |= WindowStateMask::X;
else
rData.SetX( 0 );
}
@@ -426,7 +426,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
{
rData.SetY(aTokenStr.toInt32());
if( rData.GetY() > -16384 && rData.GetY() < 16384 )
- nValidMask |= WINDOWSTATE_MASK_Y;
+ nValidMask |= WindowStateMask::Y;
else
rData.SetY( 0 );
}
@@ -437,7 +437,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
{
rData.SetWidth(aTokenStr.toInt32());
if( rData.GetWidth() > 0 && rData.GetWidth() < 16384 )
- nValidMask |= WINDOWSTATE_MASK_WIDTH;
+ nValidMask |= WindowStateMask::Width;
else
rData.SetWidth( 0 );
}
@@ -448,7 +448,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
{
rData.SetHeight(aTokenStr.toInt32());
if( rData.GetHeight() > 0 && rData.GetHeight() < 16384 )
- nValidMask |= WINDOWSTATE_MASK_HEIGHT;
+ nValidMask |= WindowStateMask::Height;
else
rData.SetHeight( 0 );
}
@@ -462,7 +462,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
sal_uInt32 nState = (sal_uInt32)aTokenStr.toInt32();
//nState &= ~(WINDOWSTATE_STATE_MINIMIZED);
rData.SetState( nState );
- nValidMask |= WINDOWSTATE_MASK_STATE;
+ nValidMask |= WindowStateMask::State;
}
else
rData.SetState( 0 );
@@ -473,7 +473,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
{
rData.SetMaximizedX(aTokenStr.toInt32());
if( rData.GetMaximizedX() > -16384 && rData.GetMaximizedX() < 16384 )
- nValidMask |= WINDOWSTATE_MASK_MAXIMIZED_X;
+ nValidMask |= WindowStateMask::MaximizedX;
else
rData.SetMaximizedX( 0 );
}
@@ -484,7 +484,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
{
rData.SetMaximizedY(aTokenStr.toInt32());
if( rData.GetMaximizedY() > -16384 && rData.GetMaximizedY() < 16384 )
- nValidMask |= WINDOWSTATE_MASK_MAXIMIZED_Y;
+ nValidMask |= WindowStateMask::MaximizedY;
else
rData.SetMaximizedY( 0 );
}
@@ -495,7 +495,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
{
rData.SetMaximizedWidth(aTokenStr.toInt32());
if( rData.GetMaximizedWidth() > 0 && rData.GetMaximizedWidth() < 16384 )
- nValidMask |= WINDOWSTATE_MASK_MAXIMIZED_WIDTH;
+ nValidMask |= WindowStateMask::MaximizedWidth;
else
rData.SetMaximizedWidth( 0 );
}
@@ -506,7 +506,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
{
rData.SetMaximizedHeight(aTokenStr.toInt32());
if( rData.GetMaximizedHeight() > 0 && rData.GetMaximizedHeight() < 16384 )
- nValidMask |= WINDOWSTATE_MASK_MAXIMIZED_HEIGHT;
+ nValidMask |= WindowStateMask::MaximizedHeight;
else
rData.SetMaximizedHeight( 0 );
}
@@ -519,25 +519,25 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
static OString ImplWindowStateToStr(const WindowStateData& rData)
{
- const sal_uInt32 nValidMask = rData.GetMask();
- if ( !nValidMask )
+ const WindowStateMask nValidMask = rData.GetMask();
+ if ( nValidMask == WindowStateMask::NONE )
return OString();
OStringBuffer rStrBuf;
- if ( nValidMask & WINDOWSTATE_MASK_X )
+ if ( nValidMask & WindowStateMask::X )
rStrBuf.append(static_cast<sal_Int32>(rData.GetX()));
rStrBuf.append(',');
- if ( nValidMask & WINDOWSTATE_MASK_Y )
+ if ( nValidMask & WindowStateMask::Y )
rStrBuf.append(static_cast<sal_Int32>(rData.GetY()));
rStrBuf.append(',');
- if ( nValidMask & WINDOWSTATE_MASK_WIDTH )
+ if ( nValidMask & WindowStateMask::Width )
rStrBuf.append(static_cast<sal_Int32>(rData.GetWidth()));
rStrBuf.append(',');
- if ( nValidMask & WINDOWSTATE_MASK_HEIGHT )
+ if ( nValidMask & WindowStateMask::Height )
rStrBuf.append(static_cast<sal_Int32>(rData.GetHeight()));
rStrBuf.append( ';' );
- if ( nValidMask & WINDOWSTATE_MASK_STATE )
+ if ( nValidMask & WindowStateMask::State )
{
// #94144# allow Minimize again, should be masked out when read from configuration
// 91625 - ignore Minimize
@@ -545,16 +545,16 @@ static OString ImplWindowStateToStr(const WindowStateData& rData)
rStrBuf.append(static_cast<sal_Int32>(nState));
}
rStrBuf.append(';');
- if ( nValidMask & WINDOWSTATE_MASK_MAXIMIZED_X )
+ if ( nValidMask & WindowStateMask::MaximizedX )
rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedX()));
rStrBuf.append(',');
- if ( nValidMask & WINDOWSTATE_MASK_MAXIMIZED_Y )
+ if ( nValidMask & WindowStateMask::MaximizedY )
rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedY()));
rStrBuf.append( ',' );
- if ( nValidMask & WINDOWSTATE_MASK_MAXIMIZED_WIDTH )
+ if ( nValidMask & WindowStateMask::MaximizedWidth )
rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedWidth()));
rStrBuf.append(',');
- if ( nValidMask & WINDOWSTATE_MASK_MAXIMIZED_HEIGHT )
+ if ( nValidMask & WindowStateMask::MaximizedHeight )
rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedHeight()));
rStrBuf.append(';');
@@ -618,8 +618,8 @@ void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, lo
void SystemWindow::SetWindowStateData( const WindowStateData& rData )
{
- const sal_uInt32 nValidMask = rData.GetMask();
- if ( !nValidMask )
+ const WindowStateMask nValidMask = rData.GetMask();
+ if ( nValidMask == WindowStateMask::NONE )
return;
if ( mbSysChild )
@@ -639,7 +639,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
aState.mnWidth = rData.GetWidth();
aState.mnHeight = rData.GetHeight();
- if( rData.GetMask() & (WINDOWSTATE_MASK_WIDTH|WINDOWSTATE_MASK_HEIGHT) )
+ if( rData.GetMask() & (WindowStateMask::Width|WindowStateMask::Height) )
{
// #i43799# adjust window state sizes if a minimal output size was set
// otherwise the frame and the client might get different sizes
@@ -664,8 +664,8 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
// #96568# avoid having multiple frames at the same screen location
// do the check only if not maximized
- if( !((rData.GetMask() & WINDOWSTATE_MASK_STATE) && (nState & WINDOWSTATE_STATE_MAXIMIZED)) )
- if( rData.GetMask() & (WINDOWSTATE_MASK_POS|WINDOWSTATE_MASK_WIDTH|WINDOWSTATE_MASK_HEIGHT) )
+ if( !((rData.GetMask() & WindowStateMask::State) && (nState & WINDOWSTATE_STATE_MAXIMIZED)) )
+ if( rData.GetMask() & (WindowStateMask::Pos|WindowStateMask::Width|WindowStateMask::Height) )
{
Rectangle aDesktop = GetDesktopRectPixel();
ImplSVData *pSVData = ImplGetSVData();
@@ -711,7 +711,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
// do a synchronous resize for layout reasons
// but use rData only when the window is not to be maximized (#i38089#)
// otherwise we have no useful size information
- if( (rData.GetMask() & WINDOWSTATE_MASK_STATE) && (nState & WINDOWSTATE_STATE_MAXIMIZED) )
+ if( (rData.GetMask() & WindowStateMask::State) && (nState & WINDOWSTATE_STATE_MAXIMIZED) )
{
// query maximized size from frame
SalFrameGeometry aGeometry = mpWindowImpl->mpFrame->GetGeometry();
@@ -723,19 +723,19 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
ImplHandleResize( pWindow, aGeometry.nWidth, aGeometry.nHeight );
}
else
- if( rData.GetMask() & (WINDOWSTATE_MASK_WIDTH|WINDOWSTATE_MASK_HEIGHT) )
+ if( rData.GetMask() & (WindowStateMask::Width|WindowStateMask::Height) )
ImplHandleResize( pWindow, aState.mnWidth, aState.mnHeight ); // #i43799# use aState and not rData, see above
}
else
{
PosSizeFlags nPosSize = PosSizeFlags::NONE;
- if ( nValidMask & WINDOWSTATE_MASK_X )
+ if ( nValidMask & WindowStateMask::X )
nPosSize |= PosSizeFlags::X;
- if ( nValidMask & WINDOWSTATE_MASK_Y )
+ if ( nValidMask & WindowStateMask::Y )
nPosSize |= PosSizeFlags::Y;
- if ( nValidMask & WINDOWSTATE_MASK_WIDTH )
+ if ( nValidMask & WindowStateMask::Width )
nPosSize |= PosSizeFlags::Width;
- if ( nValidMask & WINDOWSTATE_MASK_HEIGHT )
+ if ( nValidMask & WindowStateMask::Height )
nPosSize |= PosSizeFlags::Height;
if( IsRollUp() )
@@ -758,7 +758,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
maOrgSize = Size( nWidth, nHeight );
// 91625 - ignore Minimize
- if ( nValidMask & WINDOWSTATE_MASK_STATE )
+ if ( nValidMask & WindowStateMask::State )
{
const sal_uInt32 nState = rData.GetState();
if ( nState & WINDOWSTATE_STATE_ROLLUP )
@@ -771,8 +771,8 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
void SystemWindow::GetWindowStateData( WindowStateData& rData ) const
{
- sal_uInt32 nValidMask = rData.GetMask();
- if ( !nValidMask )
+ WindowStateMask nValidMask = rData.GetMask();
+ if ( nValidMask == WindowStateMask::NONE )
return;
if ( mbSysChild )
@@ -785,49 +785,49 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const
if ( pWindow->mpWindowImpl->mbFrame )
{
SalFrameState aState;
- aState.mnMask = 0xFFFFFFFF;
+ aState.mnMask = WindowStateMask::All;
if ( mpWindowImpl->mpFrame->GetWindowState( &aState ) )
{
- if ( nValidMask & WINDOWSTATE_MASK_X )
+ if ( nValidMask & WindowStateMask::X )
rData.SetX( aState.mnX );
- if ( nValidMask & WINDOWSTATE_MASK_Y )
+ if ( nValidMask & WindowStateMask::Y )
rData.SetY( aState.mnY );
- if ( nValidMask & WINDOWSTATE_MASK_WIDTH )
+ if ( nValidMask & WindowStateMask::Width )
rData.SetWidth( aState.mnWidth );
- if ( nValidMask & WINDOWSTATE_MASK_HEIGHT )
+ if ( nValidMask & WindowStateMask::Height )
rData.SetHeight( aState.mnHeight );
- if ( aState.mnMask & WINDOWSTATE_MASK_MAXIMIZED_X )
+ if ( aState.mnMask & WindowStateMask::MaximizedX )
{
rData.SetMaximizedX( aState.mnMaximizedX );
- nValidMask |= WINDOWSTATE_MASK_MAXIMIZED_X;
+ nValidMask |= WindowStateMask::MaximizedX;
}
- if ( aState.mnMask & WINDOWSTATE_MASK_MAXIMIZED_Y )
+ if ( aState.mnMask & WindowStateMask::MaximizedY )
{
rData.SetMaximizedY( aState.mnMaximizedY );
- nValidMask |= WINDOWSTATE_MASK_MAXIMIZED_Y;
+ nValidMask |= WindowStateMask::MaximizedY;
}
- if ( aState.mnMask & WINDOWSTATE_MASK_MAXIMIZED_WIDTH )
+ if ( aState.mnMask & WindowStateMask::MaximizedWidth )
{
rData.SetMaximizedWidth( aState.mnMaximizedWidth );
- nValidMask |= WINDOWSTATE_MASK_MAXIMIZED_WIDTH;
+ nValidMask |= WindowStateMask::MaximizedWidth;
}
- if ( aState.mnMask & WINDOWSTATE_MASK_MAXIMIZED_HEIGHT )
+ if ( aState.mnMask & WindowStateMask::MaximizedHeight )
{
rData.SetMaximizedHeight( aState.mnMaximizedHeight );
- nValidMask |= WINDOWSTATE_MASK_MAXIMIZED_HEIGHT;
+ nValidMask |= WindowStateMask::MaximizedHeight;
}
- if ( nValidMask & WINDOWSTATE_MASK_STATE )
+ if ( nValidMask & WindowStateMask::State )
{
// #94144# allow Minimize again, should be masked out when read from configuration
// 91625 - ignore Minimize
- if ( !(nValidMask&WINDOWSTATE_MASK_MINIMIZED) )
+ if ( !(nValidMask&WindowStateMask::Minimized) )
aState.mnState &= ~(WINDOWSTATE_STATE_MINIMIZED);
rData.SetState( aState.mnState );
}
rData.SetMask( nValidMask );
}
else
- rData.SetMask( 0 );
+ rData.SetMask( WindowStateMask::NONE );
}
else
{
@@ -841,15 +841,15 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const
nState = WINDOWSTATE_STATE_ROLLUP;
}
- if ( nValidMask & WINDOWSTATE_MASK_X )
+ if ( nValidMask & WindowStateMask::X )
rData.SetX( aPos.X() );
- if ( nValidMask & WINDOWSTATE_MASK_Y )
+ if ( nValidMask & WindowStateMask::Y )
rData.SetY( aPos.Y() );
- if ( nValidMask & WINDOWSTATE_MASK_WIDTH )
+ if ( nValidMask & WindowStateMask::Width )
rData.SetWidth( aSize.Width() );
- if ( nValidMask & WINDOWSTATE_MASK_HEIGHT )
+ if ( nValidMask & WindowStateMask::Height )
rData.SetHeight( aSize.Height() );
- if ( nValidMask & WINDOWSTATE_MASK_STATE )
+ if ( nValidMask & WindowStateMask::State )
rData.SetState( nState );
}
}
@@ -864,7 +864,7 @@ void SystemWindow::SetWindowState(const OString& rStr)
SetWindowStateData( aData );
}
-OString SystemWindow::GetWindowState( sal_uInt32 nMask ) const
+OString SystemWindow::GetWindowState( WindowStateMask nMask ) const
{
WindowStateData aData;
aData.SetMask( nMask );
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index caeee56..1783d91 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -232,7 +232,7 @@ bool WorkWindow::SetPluginParent( SystemParentData* pParent )
void WorkWindow::ImplSetFrameState( sal_uLong aFrameState )
{
SalFrameState aState;
- aState.mnMask = WINDOWSTATE_MASK_STATE;
+ aState.mnMask = WindowStateMask::State;
aState.mnState = aFrameState;
mpWindowImpl->mpFrame->SetWindowState( &aState );
}
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 7f4511d..9060664 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1610,11 +1610,11 @@ void X11SalFrame::SetAlwaysOnTop( bool bOnTop )
}
#define FRAMESTATE_MASK_GEOMETRY \
- (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | \
- WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT)
+ (WindowStateMask::X | WindowStateMask::Y | \
+ WindowStateMask::Width | WindowStateMask::Height)
#define FRAMESTATE_MASK_MAXIMIZED_GEOMETRY \
- (WINDOWSTATE_MASK_MAXIMIZED_X | WINDOWSTATE_MASK_MAXIMIZED_Y | \
- WINDOWSTATE_MASK_MAXIMIZED_WIDTH | WINDOWSTATE_MASK_MAXIMIZED_HEIGHT)
+ (WindowStateMask::MaximizedX | WindowStateMask::MaximizedY | \
+ WindowStateMask::MaximizedWidth | WindowStateMask::MaximizedHeight)
void X11SalFrame::SetWindowState( const SalFrameState *pState )
{
@@ -1631,7 +1631,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
* in state change below maximize window
*/
if( ! IsChildWindow() &&
- (pState->mnMask & WINDOWSTATE_MASK_STATE) &&
+ (pState->mnMask & WindowStateMask::State) &&
(pState->mnState & WINDOWSTATE_STATE_MAXIMIZED) &&
(pState->mnMask & FRAMESTATE_MASK_GEOMETRY) == FRAMESTATE_MASK_GEOMETRY &&
(pState->mnMask & FRAMESTATE_MASK_MAXIMIZED_GEOMETRY) == FRAMESTATE_MASK_MAXIMIZED_GEOMETRY
@@ -1670,21 +1670,21 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
GetPosSize (aPosSize);
// change requested properties
- if (pState->mnMask & WINDOWSTATE_MASK_X)
+ if (pState->mnMask & WindowStateMask::X)
{
aPosSize.setX (pState->mnX);
}
- if (pState->mnMask & WINDOWSTATE_MASK_Y)
+ if (pState->mnMask & WindowStateMask::Y)
{
aPosSize.setY (pState->mnY);
}
- if (pState->mnMask & WINDOWSTATE_MASK_WIDTH)
+ if (pState->mnMask & WindowStateMask::Width)
{
long nWidth = pState->mnWidth > 0 ? pState->mnWidth - 1 : 0;
aPosSize.setWidth (nWidth);
bDoAdjust = true;
}
- if (pState->mnMask & WINDOWSTATE_MASK_HEIGHT)
+ if (pState->mnMask & WindowStateMask::Height)
{
int nHeight = pState->mnHeight > 0 ? pState->mnHeight - 1 : 0;
aPosSize.setHeight (nHeight);
@@ -1730,7 +1730,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
}
// request for status change
- if (pState->mnMask & WINDOWSTATE_MASK_STATE)
+ if (pState->mnMask & WindowStateMask::State)
{
if (pState->mnState & WINDOWSTATE_STATE_MAXIMIZED)
{
@@ -1792,7 +1792,7 @@ bool X11SalFrame::GetWindowState( SalFrameState* pState )
pState->mnWidth = aPosSize.GetWidth();
pState->mnHeight = aPosSize.GetHeight();
- pState->mnMask = FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE;
+ pState->mnMask = FRAMESTATE_MASK_GEOMETRY | WindowStateMask::State;
if (! maRestorePosSize.IsEmpty() )
{
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 4a95275..fae99b7 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -1828,13 +1828,13 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
if( ! m_pWindow || ! pState || isChild( true, false ) )
return;
- const sal_uLong nMaxGeometryMask =
- WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y |
- WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT |
- WINDOWSTATE_MASK_MAXIMIZED_X | WINDOWSTATE_MASK_MAXIMIZED_Y |
- WINDOWSTATE_MASK_MAXIMIZED_WIDTH | WINDOWSTATE_MASK_MAXIMIZED_HEIGHT;
+ const WindowStateMask nMaxGeometryMask =
+ WindowStateMask::X | WindowStateMask::Y |
+ WindowStateMask::Width | WindowStateMask::Height |
+ WindowStateMask::MaximizedX | WindowStateMask::MaximizedY |
+ WindowStateMask::MaximizedWidth | WindowStateMask::MaximizedHeight;
- if( (pState->mnMask & WINDOWSTATE_MASK_STATE) &&
+ if( (pState->mnMask & WindowStateMask::State) &&
! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) &&
(pState->mnState & WINDOWSTATE_STATE_MAXIMIZED) &&
(pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask )
@@ -1854,27 +1854,27 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
Size( pState->mnWidth, pState->mnHeight ) );
CallCallback( SALEVENT_RESIZE, nullptr );
}
- else if( pState->mnMask & (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y |
- WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT ) )
+ else if( pState->mnMask & (WindowStateMask::X | WindowStateMask::Y |
+ WindowStateMask::Width | WindowStateMask::Height ) )
{
sal_uInt16 nPosSizeFlags = 0;
long nX = pState->mnX - (m_pParent ? m_pParent->maGeometry.nX : 0);
long nY = pState->mnY - (m_pParent ? m_pParent->maGeometry.nY : 0);
- if( pState->mnMask & WINDOWSTATE_MASK_X )
+ if( pState->mnMask & WindowStateMask::X )
nPosSizeFlags |= SAL_FRAME_POSSIZE_X;
else
nX = maGeometry.nX - (m_pParent ? m_pParent->maGeometry.nX : 0);
- if( pState->mnMask & WINDOWSTATE_MASK_Y )
+ if( pState->mnMask & WindowStateMask::Y )
nPosSizeFlags |= SAL_FRAME_POSSIZE_Y;
else
nY = maGeometry.nY - (m_pParent ? m_pParent->maGeometry.nY : 0);
- if( pState->mnMask & WINDOWSTATE_MASK_WIDTH )
+ if( pState->mnMask & WindowStateMask::Width )
nPosSizeFlags |= SAL_FRAME_POSSIZE_WIDTH;
- if( pState->mnMask & WINDOWSTATE_MASK_HEIGHT )
+ if( pState->mnMask & WindowStateMask::Height )
nPosSizeFlags |= SAL_FRAME_POSSIZE_HEIGHT;
SetPosSize( nX, nY, pState->mnWidth, pState->mnHeight, nPosSizeFlags );
}
- if( pState->mnMask & WINDOWSTATE_MASK_STATE && ! isChild() )
+ if( pState->mnMask & WindowStateMask::State && ! isChild() )
{
if( pState->mnState & WINDOWSTATE_STATE_MAXIMIZED )
gtk_window_maximize( GTK_WINDOW(m_pWindow) );
@@ -1900,7 +1900,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
bool GtkSalFrame::GetWindowState( SalFrameState* pState )
{
pState->mnState = WINDOWSTATE_STATE_NORMAL;
- pState->mnMask = WINDOWSTATE_MASK_STATE;
+ pState->mnMask = WindowStateMask::State;
// rollup ? gtk 2.2 does not seem to support the shaded state
if( (m_nState & GDK_WINDOW_STATE_ICONIFIED) )
pState->mnState |= WINDOWSTATE_STATE_MINIMIZED;
@@ -1915,10 +1915,10 @@ bool GtkSalFrame::GetWindowState( SalFrameState* pState )
pState->mnMaximizedY = maGeometry.nY;
pState->mnMaximizedWidth = maGeometry.nWidth;
pState->mnMaximizedHeight = maGeometry.nHeight;
- pState->mnMask |= WINDOWSTATE_MASK_MAXIMIZED_X |
- WINDOWSTATE_MASK_MAXIMIZED_Y |
- WINDOWSTATE_MASK_MAXIMIZED_WIDTH |
- WINDOWSTATE_MASK_MAXIMIZED_HEIGHT;
+ pState->mnMask |= WindowStateMask::MaximizedX |
+ WindowStateMask::MaximizedY |
+ WindowStateMask::MaximizedWidth |
+ WindowStateMask::MaximizedHeight;
}
else
{
@@ -1927,10 +1927,10 @@ bool GtkSalFrame::GetWindowState( SalFrameState* pState )
pState->mnWidth = maGeometry.nWidth;
pState->mnHeight = maGeometry.nHeight;
}
- pState->mnMask |= WINDOWSTATE_MASK_X |
- WINDOWSTATE_MASK_Y |
- WINDOWSTATE_MASK_WIDTH |
- WINDOWSTATE_MASK_HEIGHT;
+ pState->mnMask |= WindowStateMask::X |
+ WindowStateMask::Y |
+ WindowStateMask::Width |
+ WindowStateMask::Height;
return true;
}
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index ec96b07..51d40c9 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1654,13 +1654,13 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
if( ! m_pWindow || ! pState || isChild( true, false ) )
return;
- const sal_uLong nMaxGeometryMask =
- WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y |
- WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT |
- WINDOWSTATE_MASK_MAXIMIZED_X | WINDOWSTATE_MASK_MAXIMIZED_Y |
- WINDOWSTATE_MASK_MAXIMIZED_WIDTH | WINDOWSTATE_MASK_MAXIMIZED_HEIGHT;
+ const WindowStateMask nMaxGeometryMask =
+ WindowStateMask::X | WindowStateMask::Y |
+ WindowStateMask::Width | WindowStateMask::Height |
+ WindowStateMask::MaximizedX | WindowStateMask::MaximizedY |
+ WindowStateMask::MaximizedWidth | WindowStateMask::MaximizedHeight;
- if( (pState->mnMask & WINDOWSTATE_MASK_STATE) &&
+ if( (pState->mnMask & WindowStateMask::State) &&
! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) &&
(pState->mnState & WINDOWSTATE_STATE_MAXIMIZED) &&
(pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask )
@@ -1675,27 +1675,27 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
m_aRestorePosSize = Rectangle( Point( pState->mnX, pState->mnY ),
Size( pState->mnWidth, pState->mnHeight ) );
}
- else if( pState->mnMask & (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y |
- WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT ) )
+ else if( pState->mnMask & (WindowStateMask::X | WindowStateMask::Y |
+ WindowStateMask::Width | WindowStateMask::Height ) )
{
sal_uInt16 nPosSizeFlags = 0;
long nX = pState->mnX - (m_pParent ? m_pParent->maGeometry.nX : 0);
long nY = pState->mnY - (m_pParent ? m_pParent->maGeometry.nY : 0);
- if( pState->mnMask & WINDOWSTATE_MASK_X )
+ if( pState->mnMask & WindowStateMask::X )
nPosSizeFlags |= SAL_FRAME_POSSIZE_X;
else
nX = maGeometry.nX - (m_pParent ? m_pParent->maGeometry.nX : 0);
- if( pState->mnMask & WINDOWSTATE_MASK_Y )
+ if( pState->mnMask & WindowStateMask::Y )
nPosSizeFlags |= SAL_FRAME_POSSIZE_Y;
else
nY = maGeometry.nY - (m_pParent ? m_pParent->maGeometry.nY : 0);
- if( pState->mnMask & WINDOWSTATE_MASK_WIDTH )
+ if( pState->mnMask & WindowStateMask::Width )
nPosSizeFlags |= SAL_FRAME_POSSIZE_WIDTH;
- if( pState->mnMask & WINDOWSTATE_MASK_HEIGHT )
+ if( pState->mnMask & WindowStateMask::Height )
nPosSizeFlags |= SAL_FRAME_POSSIZE_HEIGHT;
SetPosSize( nX, nY, pState->mnWidth, pState->mnHeight, nPosSizeFlags );
}
- if( pState->mnMask & WINDOWSTATE_MASK_STATE && ! isChild() )
+ if( pState->mnMask & WindowStateMask::State && ! isChild() )
{
if( pState->mnState & WINDOWSTATE_STATE_MAXIMIZED )
gtk_window_maximize( GTK_WINDOW(m_pWindow) );
@@ -1743,7 +1743,7 @@ namespace
bool GtkSalFrame::GetWindowState( SalFrameState* pState )
{
pState->mnState = WINDOWSTATE_STATE_NORMAL;
- pState->mnMask = WINDOWSTATE_MASK_STATE;
+ pState->mnMask = WindowStateMask::State;
// rollup ? gtk 2.2 does not seem to support the shaded state
if( (m_nState & GDK_WINDOW_STATE_ICONIFIED) )
pState->mnState |= WINDOWSTATE_STATE_MINIMIZED;
@@ -1756,20 +1756,20 @@ bool GtkSalFrame::GetWindowState( SalFrameState* pState )
pState->mnHeight = m_aRestorePosSize.GetHeight();
GetPosAndSize(GTK_WINDOW(m_pWindow), pState->mnMaximizedX, pState->mnMaximizedY,
pState->mnMaximizedWidth, pState->mnMaximizedHeight);
- pState->mnMask |= WINDOWSTATE_MASK_MAXIMIZED_X |
- WINDOWSTATE_MASK_MAXIMIZED_Y |
- WINDOWSTATE_MASK_MAXIMIZED_WIDTH |
- WINDOWSTATE_MASK_MAXIMIZED_HEIGHT;
+ pState->mnMask |= WindowStateMask::MaximizedX |
+ WindowStateMask::MaximizedY |
+ WindowStateMask::MaximizedWidth |
+ WindowStateMask::MaximizedHeight;
}
else
{
GetPosAndSize(GTK_WINDOW(m_pWindow), pState->mnX, pState->mnY,
pState->mnWidth, pState->mnHeight);
}
- pState->mnMask |= WINDOWSTATE_MASK_X |
- WINDOWSTATE_MASK_Y |
- WINDOWSTATE_MASK_WIDTH |
- WINDOWSTATE_MASK_HEIGHT;
+ pState->mnMask |= WindowStateMask::X |
+ WindowStateMask::Y |
+ WindowStateMask::Width |
+ WindowStateMask::Height;
return true;
}
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 851c2a1..3fd2be1 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1655,23 +1655,23 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState )
long nRightDeco = abs( aWinRect.right - aRect2.right );
// adjust window position/size to fit the screen
- if ( !(pState->mnMask & (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y)) )
+ if ( !(pState->mnMask & (WindowStateMask::X | WindowStateMask::Y)) )
nPosSize |= SWP_NOMOVE;
- if ( !(pState->mnMask & (WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT)) )
+ if ( !(pState->mnMask & (WindowStateMask::Width | WindowStateMask::Height)) )
nPosSize |= SWP_NOSIZE;
- if ( pState->mnMask & WINDOWSTATE_MASK_X )
+ if ( pState->mnMask & WindowStateMask::X )
nX = (int)pState->mnX - nLeftDeco;
else
nX = aWinRect.left;
- if ( pState->mnMask & WINDOWSTATE_MASK_Y )
+ if ( pState->mnMask & WindowStateMask::Y )
nY = (int)pState->mnY - nTopDeco;
else
nY = aWinRect.top;
- if ( pState->mnMask & WINDOWSTATE_MASK_WIDTH )
+ if ( pState->mnMask & WindowStateMask::Width )
nWidth = (int)pState->mnWidth + nLeftDeco + nRightDeco;
else
nWidth = aWinRect.right-aWinRect.left;
- if ( pState->mnMask & WINDOWSTATE_MASK_HEIGHT )
+ if ( pState->mnMask & WindowStateMask::Height )
nHeight = (int)pState->mnHeight + nTopDeco + nBottomDeco;
else
nHeight = aWinRect.bottom-aWinRect.top;
@@ -1706,7 +1706,7 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState )
if ( mbOverwriteState )
{
- if ( pState->mnMask & WINDOWSTATE_MASK_STATE )
+ if ( pState->mnMask & WindowStateMask::State )
{
if ( pState->mnState & WINDOWSTATE_STATE_MINIMIZED )
mnShowState = SW_SHOWMINIMIZED;
@@ -1722,7 +1722,7 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState )
}
else
{
- if ( pState->mnMask & WINDOWSTATE_MASK_STATE )
+ if ( pState->mnMask & WindowStateMask::State )
{
if ( pState->mnState & WINDOWSTATE_STATE_MINIMIZED )
{
More information about the Libreoffice-commits
mailing list