From ac628ead05ca2ae85df8e5a33c25a20b2930dcce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 30 Nov 2009 08:06:50 +0000 Subject: [PATCH] * Moved the B_NOT_MINIMIZABLE flag check into ServerWindow::NotifyMinimize() as this fixes some more incorrect minimizations on the app_server side. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34361 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Desktop.cpp | 3 +-- src/servers/app/ServerWindow.cpp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index af003a6db2..e67b69ed0e 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -1859,8 +1859,7 @@ Desktop::MinimizeApplication(team_id team) if (window->ServerWindow()->ClientTeam() != team) continue; - if ((window->Flags() & B_NOT_MINIMIZABLE) == 0) - window->ServerWindow()->NotifyMinimize(true); + window->ServerWindow()->NotifyMinimize(true); } } diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp index 49ae78451b..ad6e107b0c 100644 --- a/src/servers/app/ServerWindow.cpp +++ b/src/servers/app/ServerWindow.cpp @@ -425,7 +425,8 @@ ServerWindow::NotifyQuitRequested() void ServerWindow::NotifyMinimize(bool minimize) { - if (fWindow->Feel() != B_NORMAL_WINDOW_FEEL) + if (fWindow->Feel() != B_NORMAL_WINDOW_FEEL + || ((fWindow->Flags() & B_NOT_MINIMIZABLE) == 0 && minimize)) return; // The client is responsible for the actual minimization