include/vcl/syswin.hxx | 54 ----------------------------
include/vcl/windowstate.hxx | 82 +++++++++++++++++++++++++++++++++++++++++++
vcl/source/window/syswin.cxx | 24 ++++++------
vcl/unx/gtk3/gtk3gtkinst.cxx | 2 -
4 files changed, 96 insertions(+), 66 deletions(-)
New commits:
commit 24199261767ce86674d675b7e5fa7ce3a615f442
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 30 09:13:17 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 30 17:01:41 2019 +0100
split WindowStateData into its own header
Change-Id: I2ad8f4edd1d8e0f4a4f9a1eec546f98d94a48198
Reviewed-on: https://gerrit.libreoffice.org/81743
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index ce69f1f81b1c..9e0ea674ba5b 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -25,6 +25,7 @@
#include <vcl/idle.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/window.hxx>
+#include <vcl/windowstate.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
#include <vcl/NotebookBarAddonsMerger.hxx>
@@ -43,59 +44,6 @@ class TaskPaneList;
#define ICON_MATH_DOCUMENT 13
#define ICON_MACROLIBRARY 1
-class VCL_PLUGIN_PUBLIC WindowStateData
-{
-private:
- WindowStateMask mnValidMask;
- int mnX;
- int mnY;
- unsigned int mnWidth;
- unsigned int mnHeight;
- int mnMaximizedX;
- int mnMaximizedY;
- unsigned int mnMaximizedWidth;
- unsigned int mnMaximizedHeight;
- WindowStateState mnState;
-
-public:
- WindowStateData()
- : mnValidMask(WindowStateMask::NONE)
- , mnX(0)
- , mnY(0)
- , mnWidth(0)
- , mnHeight(0)
- , mnMaximizedX(0)
- , mnMaximizedY(0)
- , mnMaximizedWidth(0)
- , mnMaximizedHeight(0)
- , mnState(WindowStateState::NONE)
- {
- }
-
- void SetMask( WindowStateMask nValidMask ) { mnValidMask =
nValidMask; }
- WindowStateMask GetMask() const { return mnValidMask; }
-
- void SetX( int nX ) { mnX = nX; }
- int GetX() const { return mnX; }
- void SetY( int nY ) { mnY = nY; }
- int GetY() const { return mnY; }
- void SetWidth( unsigned int nWidth ) { mnWidth = nWidth; }
- unsigned int GetWidth() const { return mnWidth; }
- void SetHeight( unsigned int nHeight ) { mnHeight = nHeight; }
- unsigned int GetHeight() const { return mnHeight; }
- void SetState( WindowStateState nState ) { mnState = nState; }
- WindowStateState GetState() const { return mnState; }
- void SetMaximizedX( int nRX ) { mnMaximizedX = nRX; }
- int GetMaximizedX() const { return mnMaximizedX; }
- void SetMaximizedY( int nRY ) { mnMaximizedY = nRY; }
- int GetMaximizedY() const { return mnMaximizedY; }
- void SetMaximizedWidth( unsigned int nRWidth ) { mnMaximizedWidth
= nRWidth; }
- unsigned int GetMaximizedWidth() const { return mnMaximizedWidth; }
- void SetMaximizedHeight( unsigned int nRHeight ) {
mnMaximizedHeight = nRHeight; }
- unsigned int GetMaximizedHeight() const { return mnMaximizedHeight; }
-};
-
-
enum class MenuBarMode
{
Normal, Hide
diff --git a/include/vcl/windowstate.hxx b/include/vcl/windowstate.hxx
new file mode 100644
index 000000000000..3935512612cc
--- /dev/null
+++ b/include/vcl/windowstate.hxx
@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_WINDOWSTATE_HXX
+#define INCLUDED_VCL_WINDOWSTATE_HXX
+
+#include <vcl/dllapi.h>
+#include <vcl/vclenum.hxx>
+
+class VCL_PLUGIN_PUBLIC WindowStateData
+{
+private:
+ WindowStateMask mnValidMask;
+ int mnX;
+ int mnY;
+ unsigned int mnWidth;
+ unsigned int mnHeight;
+ int mnMaximizedX;
+ int mnMaximizedY;
+ unsigned int mnMaximizedWidth;
+ unsigned int mnMaximizedHeight;
+ WindowStateState mnState;
+
+public:
+ WindowStateData()
+ : mnValidMask(WindowStateMask::NONE)
+ , mnX(0)
+ , mnY(0)
+ , mnWidth(0)
+ , mnHeight(0)
+ , mnMaximizedX(0)
+ , mnMaximizedY(0)
+ , mnMaximizedWidth(0)
+ , mnMaximizedHeight(0)
+ , mnState(WindowStateState::NONE)
+ {
+ }
+
+ void SetMask(WindowStateMask nValidMask) { mnValidMask = nValidMask; }
+ WindowStateMask GetMask() const { return mnValidMask; }
+
+ void SetX(int nX) { mnX = nX; }
+ int GetX() const { return mnX; }
+ void SetY(int nY) { mnY = nY; }
+ int GetY() const { return mnY; }
+ void SetWidth(unsigned int nWidth) { mnWidth = nWidth; }
+ unsigned int GetWidth() const { return mnWidth; }
+ void SetHeight(unsigned int nHeight) { mnHeight = nHeight; }
+ unsigned int GetHeight() const { return mnHeight; }
+ void SetState(WindowStateState nState) { mnState = nState; }
+ WindowStateState GetState() const { return mnState; }
+ void SetMaximizedX(int nRX) { mnMaximizedX = nRX; }
+ int GetMaximizedX() const { return mnMaximizedX; }
+ void SetMaximizedY(int nRY) { mnMaximizedY = nRY; }
+ int GetMaximizedY() const { return mnMaximizedY; }
+ void SetMaximizedWidth(unsigned int nRWidth) { mnMaximizedWidth = nRWidth;
}
+ unsigned int GetMaximizedWidth() const { return mnMaximizedWidth; }
+ void SetMaximizedHeight(unsigned int nRHeight) { mnMaximizedHeight =
nRHeight; }
+ unsigned int GetMaximizedHeight() const { return mnMaximizedHeight; }
+
+ OString ToStr() const;
+};
+
+#endif // INCLUDED_VCL_WINDOWSTATE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 5d87ad141c7b..ce463c6b5551 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -542,45 +542,45 @@ void ImplWindowStateFromStr(WindowStateData& rData,
rData.SetMask( nValidMask );
}
-OString ImplWindowStateToStr(const WindowStateData& rData)
+OString WindowStateData::ToStr() const
{
- const WindowStateMask nValidMask = rData.GetMask();
+ const WindowStateMask nValidMask = GetMask();
if ( nValidMask == WindowStateMask::NONE )
return OString();
OStringBuffer rStrBuf(64);
if ( nValidMask & WindowStateMask::X )
- rStrBuf.append(static_cast<sal_Int32>(rData.GetX()));
+ rStrBuf.append(static_cast<sal_Int32>(GetX()));
rStrBuf.append(',');
if ( nValidMask & WindowStateMask::Y )
- rStrBuf.append(static_cast<sal_Int32>(rData.GetY()));
+ rStrBuf.append(static_cast<sal_Int32>(GetY()));
rStrBuf.append(',');
if ( nValidMask & WindowStateMask::Width )
- rStrBuf.append(static_cast<sal_Int32>(rData.GetWidth()));
+ rStrBuf.append(static_cast<sal_Int32>(GetWidth()));
rStrBuf.append(',');
if ( nValidMask & WindowStateMask::Height )
- rStrBuf.append(static_cast<sal_Int32>(rData.GetHeight()));
+ rStrBuf.append(static_cast<sal_Int32>(GetHeight()));
rStrBuf.append( ';' );
if ( nValidMask & WindowStateMask::State )
{
// #94144# allow Minimize again, should be masked out when read from
configuration
// 91625 - ignore Minimize
- WindowStateState nState = rData.GetState();
+ WindowStateState nState = GetState();
rStrBuf.append(static_cast<sal_Int32>(nState));
}
rStrBuf.append(';');
if ( nValidMask & WindowStateMask::MaximizedX )
- rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedX()));
+ rStrBuf.append(static_cast<sal_Int32>(GetMaximizedX()));
rStrBuf.append(',');
if ( nValidMask & WindowStateMask::MaximizedY )
- rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedY()));
+ rStrBuf.append(static_cast<sal_Int32>(GetMaximizedY()));
rStrBuf.append( ',' );
if ( nValidMask & WindowStateMask::MaximizedWidth )
- rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedWidth()));
+ rStrBuf.append(static_cast<sal_Int32>(GetMaximizedWidth()));
rStrBuf.append(',');
if ( nValidMask & WindowStateMask::MaximizedHeight )
- rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedHeight()));
+ rStrBuf.append(static_cast<sal_Int32>(GetMaximizedHeight()));
rStrBuf.append(';');
return rStrBuf.makeStringAndClear();
@@ -895,7 +895,7 @@ OString SystemWindow::GetWindowState( WindowStateMask nMask
) const
aData.SetMask( nMask );
GetWindowStateData( aData );
- return ImplWindowStateToStr(aData);
+ return aData.ToStr();
}
void SystemWindow::SetMenuBar(MenuBar* pMenuBar)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 58d6f86a0f83..6c318ce0bb91 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3611,7 +3611,7 @@ public:
aData.SetHeight(aSize.Height());
}
- return ImplWindowStateToStr(aData);
+ return aData.ToStr();
}
virtual void connect_toplevel_focus_changed(const Link<weld::Widget&,
void>& rLink) override
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
