* 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
This commit is contained in:
@@ -820,6 +820,10 @@ WindowLayer::AddToSubset(WindowLayer* window)
|
|||||||
|| fFeel == B_MODAL_ALL_WINDOW_FEEL)
|
|| fFeel == B_MODAL_ALL_WINDOW_FEEL)
|
||||||
return true;
|
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);
|
return fSubsets.AddItem(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -828,7 +832,9 @@ void
|
|||||||
WindowLayer::RemoveFromSubset(WindowLayer* window)
|
WindowLayer::RemoveFromSubset(WindowLayer* window)
|
||||||
{
|
{
|
||||||
if (fFeel == B_FLOATING_ALL_WINDOW_FEEL
|
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;
|
return;
|
||||||
|
|
||||||
fSubsets.RemoveItem(window);
|
fSubsets.RemoveItem(window);
|
||||||
@@ -842,6 +848,10 @@ WindowLayer::HasInSubset(WindowLayer* window)
|
|||||||
|| fFeel == B_MODAL_ALL_WINDOW_FEEL)
|
|| fFeel == B_MODAL_ALL_WINDOW_FEEL)
|
||||||
return true;
|
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);
|
return fSubsets.HasItem(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user