From 47cfc5da2b3e35bb3810ec4542ae3093fde217b5 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Thu, 30 Apr 2020 19:39:12 +0200 Subject: [PATCH] update linux part --- app/SysTray-X/windowctrl-unix.cpp | 22 +++++++++++++++++++++- app/SysTray-X/windowctrl-unix.h | 4 ++-- app/SysTray-X/windowctrl-win.cpp | 2 ++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/app/SysTray-X/windowctrl-unix.cpp b/app/SysTray-X/windowctrl-unix.cpp index 7d784ee..de844ff 100644 --- a/app/SysTray-X/windowctrl-unix.cpp +++ b/app/SysTray-X/windowctrl-unix.cpp @@ -21,7 +21,7 @@ WindowCtrlUnix::WindowCtrlUnix( QObject *parent ) : QObject( parent ) */ m_tb_window = 0; m_tb_windows = QList< quint64 >(); - m_state = QString(); + m_window_state = QString(); /* * Get the base display and window @@ -41,6 +41,26 @@ void WindowCtrlUnix::setMinimizeType( Preferences::MinimizeType type ) } +/* + * Set the window state. + */ +void WindowCtrlUnix::setWindowState( const QString& state ) +{ + m_window_state = state; +} + + +/** + * @brief getWindowState. Get the window state. + * + * @return The state. + */ +const QString& WindowCtrlUnix::getWindowState() const +{ + return m_window_state; +} + + /* * Get the minimize type */ diff --git a/app/SysTray-X/windowctrl-unix.h b/app/SysTray-X/windowctrl-unix.h index 50edfde..ed9603e 100644 --- a/app/SysTray-X/windowctrl-unix.h +++ b/app/SysTray-X/windowctrl-unix.h @@ -137,7 +137,7 @@ class WindowCtrlUnix : public QObject * * @return The state. */ - QString& getWindowState() const; + const QString& getWindowState() const; /** * @brief setMinimizeType @@ -389,7 +389,7 @@ class WindowCtrlUnix : public QObject /** * @brief m_state. State of the TB window. */ - QString m_state; + QString m_window_state; }; #endif // WINDOWCTRLUNIX_H diff --git a/app/SysTray-X/windowctrl-win.cpp b/app/SysTray-X/windowctrl-win.cpp index f1b6fc5..d57f540 100644 --- a/app/SysTray-X/windowctrl-win.cpp +++ b/app/SysTray-X/windowctrl-win.cpp @@ -58,6 +58,7 @@ WindowCtrlWin::~WindowCtrlWin() stopInterceptMinimizeWindow(); } + /* * Set the window state. */ @@ -66,6 +67,7 @@ void WindowCtrlWin::setWindowState( const QString& state ) m_window_state = state; } + /** * @brief getWindowState. Get the window state. *