diff options
| author | ritsuka <[email protected]> | 2014-11-13 07:16:17 +0000 |
|---|---|---|
| committer | ritsuka <[email protected]> | 2014-11-13 07:16:17 +0000 |
| commit | 1a09abd0c948542884edf019a26f7aeb28825647 (patch) | |
| tree | 5ad319f3eb5a73b38b18d57a48b13a8a182c1d5b /macosx | |
| parent | 3db705fd761c286f8ff96dbe0687b44375756289 (diff) | |
MacGui: revert the picture settings panel appearance to aqua on Yosemite.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6514 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/English.lproj/PictureSettings.xib | 6 | ||||
| -rw-r--r-- | macosx/PictureController.m | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/macosx/English.lproj/PictureSettings.xib b/macosx/English.lproj/PictureSettings.xib index 858736fee..f7f43f608 100644 --- a/macosx/English.lproj/PictureSettings.xib +++ b/macosx/English.lproj/PictureSettings.xib @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14B23" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> <deployment version="1060" identifier="macosx"/> <development version="5100" identifier="xcode"/> @@ -165,7 +165,7 @@ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="44"> <rect key="frame" x="143" y="103" width="15" height="22"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="169"> + <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="59" id="169"> <font key="font" metaFont="smallSystem"/> </stepperCell> <connections> @@ -208,7 +208,7 @@ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="46"> <rect key="frame" x="143" y="78" width="15" height="22"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="59" id="171"> + <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="171"> <font key="font" metaFont="smallSystem"/> </stepperCell> <connections> diff --git a/macosx/PictureController.m b/macosx/PictureController.m index cfb34049b..2c225eb70 100644 --- a/macosx/PictureController.m +++ b/macosx/PictureController.m @@ -155,6 +155,14 @@ static void *HBPictureControllerContext = &HBPictureControllerContext; { [[self window] setExcludedFromWindowsMenu:YES]; + // Set the panel appearance explicity to aqua. + // can be removed when Apple will fix UI appearance on Yosemite. + if (NSClassFromString(@"NSVisualEffectView")) { + [self.window setAppearance:[NSClassFromString(@"NSAppearance") appearanceNamed:@"NSAppearanceNameAqua"]]; + } + + [[self window] setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameAqua]]; + /* Populate the user interface */ [fWidthStepper setValueWraps: NO]; [fHeightStepper setValueWraps: NO]; |