From 3b0016438eefd20b978ebf9e3adb2e6e949bd0d6 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Fri, 22 Jul 2022 11:35:23 +0300 Subject: [PATCH 1/2] Removed unused comments --- win-linux/src/windows/platform_linux/cwindowplatform.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/win-linux/src/windows/platform_linux/cwindowplatform.cpp b/win-linux/src/windows/platform_linux/cwindowplatform.cpp index cf92a8b5d..dd598bceb 100644 --- a/win-linux/src/windows/platform_linux/cwindowplatform.cpp +++ b/win-linux/src/windows/platform_linux/cwindowplatform.cpp @@ -119,15 +119,6 @@ bool CWindowPlatform::event(QEvent * event) static bool _flg_left_button = false; if (event->type() == QEvent::WindowStateChange) { CX11Decoration::setMaximized(isMaximized() ? true : false); - /*if(windowState().testFlag(Qt::WindowMaximized)) { - applyWindowState(Qt::WindowMaximized); - } else - if (windowState().testFlag(Qt::WindowNoState)) { - applyWindowState(Qt::WindowNoState); - } else - if (windowState().testFlag(Qt::WindowMinimized)) { - applyWindowState(Qt::WindowMinimized); - }*/ applyWindowState(); adjustGeometry(); } else From 17fa0abc34b0c0359f23ccce5088de8a72b63903 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Fri, 22 Jul 2022 11:37:03 +0300 Subject: [PATCH 2/2] Fixed a bug with restoring the window state when opening files --- win-linux/src/cascapplicationmanagerwrapper.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index 4d7b63bf4..4445f1c53 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -895,6 +895,10 @@ void CAscApplicationManagerWrapper::handleInputCmd(const std::vector& v } _app.mainWindow()->attachEditor(panel); + if (_app.mainWindow()->isMinimized()) { + _app.mainWindow()->windowState() == (Qt::WindowMinimized | Qt::WindowMaximized) ? + _app.mainWindow()->showMaximized() : _app.mainWindow()->showNormal(); + } } } }