i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ActivityMonitor: completes hrev46476

Browse Source 
* set the settings window feel to modal when going always on top.
* fix the settings window activation when already opened.
This commit is contained in:
Jérôme Duval
2013-12-02 19:40:29 +01:00
parent 89e0a7fb84
commit 2031159e73
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/activitymonitor/ActivityWindow.cpp
+8 -3
View File
@@ -196,7 +196,6 @@ ActivityWindow::MessageReceived(BMessage* message)
// Just bring the window to front (via scripting) // Just bring the window to front (via scripting)
BMessage toFront(B_SET_PROPERTY); BMessage toFront(B_SET_PROPERTY);
toFront.AddSpecifier("Active"); toFront.AddSpecifier("Active");
toFront.AddSpecifier("Window", B_TRANSLATE("Settings"));
toFront.AddBool("data", true); toFront.AddBool("data", true);
fSettingsWindow.SendMessage(&toFront); fSettingsWindow.SendMessage(&toFront);
} else { } else {
@@ -256,7 +255,7 @@ ActivityWindow::ActivityViewAt(int32 index) const
bool bool
ActivityWindow::IsAlwaysOnTop() const ActivityWindow::IsAlwaysOnTop() const
{ {
return fAlwaysOnTop->IsMarked(); return fAlwaysOnTop->IsMarked();
} }
@@ -399,5 +398,11 @@ ActivityWindow::_SetAlwaysOnTop(bool alwaysOnTop)
{ {
SetFeel(alwaysOnTop ? B_FLOATING_ALL_WINDOW_FEEL : B_NORMAL_WINDOW_FEEL); SetFeel(alwaysOnTop ? B_FLOATING_ALL_WINDOW_FEEL : B_NORMAL_WINDOW_FEEL);
fAlwaysOnTop->SetMarked(alwaysOnTop); fAlwaysOnTop->SetMarked(alwaysOnTop);
if (fSettingsWindow.IsValid() && alwaysOnTop) {
// Change the settings window feel to modal (via scripting)
BMessage toFront(B_SET_PROPERTY);
toFront.AddSpecifier("Feel");
toFront.AddInt32("data", B_MODAL_ALL_WINDOW_FEEL);
fSettingsWindow.SendMessage(&toFront);
}
} }