From b2d24b66da7f3d8c085515e00aa1131bc0180b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 2 Dec 2005 15:48:21 +0000 Subject: [PATCH] * B_MODAL_APP_WINDOW_FEEL windows now also work correctly. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15284 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/WindowLayer.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/servers/app/WindowLayer.cpp b/src/servers/app/WindowLayer.cpp index 2044cc9164..8ecdffd73a 100644 --- a/src/servers/app/WindowLayer.cpp +++ b/src/servers/app/WindowLayer.cpp @@ -820,6 +820,10 @@ WindowLayer::AddToSubset(WindowLayer* window) || fFeel == B_MODAL_ALL_WINDOW_FEEL) return true; + if (fFeel == B_FLOATING_APP_WINDOW_FEEL + || fFeel == B_MODAL_APP_WINDOW_FEEL) + return window->Window()->App() == Window()->App(); + return fSubsets.AddItem(window); } @@ -828,7 +832,9 @@ void WindowLayer::RemoveFromSubset(WindowLayer* window) { if (fFeel == B_FLOATING_ALL_WINDOW_FEEL - || fFeel == B_MODAL_ALL_WINDOW_FEEL) + || fFeel == B_MODAL_ALL_WINDOW_FEEL + || fFeel == B_FLOATING_APP_WINDOW_FEEL + || fFeel == B_MODAL_APP_WINDOW_FEEL) return; fSubsets.RemoveItem(window); @@ -842,6 +848,10 @@ WindowLayer::HasInSubset(WindowLayer* window) || fFeel == B_MODAL_ALL_WINDOW_FEEL) return true; + if (fFeel == B_FLOATING_APP_WINDOW_FEEL + || fFeel == B_MODAL_APP_WINDOW_FEEL) + return window->Window()->App() == Window()->App(); + return fSubsets.HasItem(window); }