summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordynaflash <[email protected]>2009-03-05 23:07:19 +0000
committerdynaflash <[email protected]>2009-03-05 23:07:19 +0000
commitd136fdc0ab450fdc8b3a8276339b861e6fb48c6f (patch)
tree2ff38e004be5f4503c4c255c9295112170dfb8ab
parent1c3b73c478a542c749063599b42ec923bc39176e (diff)
MacGui: Fix picture settings panel so that it stays on top when open like a true hud inspector.
- Add "Hide On Deactivate" property to the xib so that if another app is in focus the panel properly hides. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2228 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/English.lproj/PictureSettings.xib4
-rw-r--r--macosx/PictureController.mm9
2 files changed, 9 insertions, 4 deletions
diff --git a/macosx/English.lproj/PictureSettings.xib b/macosx/English.lproj/PictureSettings.xib
index fe8dcec82..90a8a15d9 100644
--- a/macosx/English.lproj/PictureSettings.xib
+++ b/macosx/English.lproj/PictureSettings.xib
@@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="6"/>
+ <integer value="5"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -38,7 +38,7 @@
<int key="NSWindowStyleMask">8215</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{1211, 290}, {311, 447}}</string>
- <int key="NSWTFlags">1886913536</int>
+ <int key="NSWTFlags">-260570112</int>
<string key="NSWindowTitle">Picture Settings</string>
<string key="NSWindowClass">NSPanel</string>
<object class="NSMutableString" key="NSViewClass">
diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 702816c8f..3c078191b 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -84,8 +84,13 @@
- (void) setToWindowedMode
{
- /* Set the window back to regular level */
- [[self window] setLevel:NSNormalWindowLevel];
+ /* Set the window back to Floating Window mode
+ * This will put the window always on top, but
+ * since we have Hide on Deactivate set in our
+ * xib, if other apps are put in focus we will
+ * hide properly to stay out of the way
+ */
+ [[self window] setLevel:NSFloatingWindowLevel];
}
- (void)setHBController: (HBController *)controller