vlc | branch: master | Marvin Scholz <[email protected]> | Tue Aug 15 21:54:10 2017 +0200| [861680999d0c81772a442521560914543b3bf46a] | committer: Marvin Scholz
macosx: Use VLCBottomBarView > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=861680999d0c81772a442521560914543b3bf46a --- modules/gui/macosx/UI/DetachedVideoWindow.xib | 2 +- modules/gui/macosx/UI/MainWindow.xib | 2 +- modules/gui/macosx/VLCControlsBarCommon.h | 3 ++- modules/gui/macosx/VLCControlsBarCommon.m | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/gui/macosx/UI/DetachedVideoWindow.xib b/modules/gui/macosx/UI/DetachedVideoWindow.xib index 08d9cf2231..821600cb88 100644 --- a/modules/gui/macosx/UI/DetachedVideoWindow.xib +++ b/modules/gui/macosx/UI/DetachedVideoWindow.xib @@ -109,7 +109,7 @@ <outlet property="yellowButton" destination="25" id="RzQ-RH-CMN"/> </connections> </customView> - <customView translatesAutoresizingMaskIntoConstraints="NO" id="5" customClass="VLCThreePartImageView"> + <customView translatesAutoresizingMaskIntoConstraints="NO" id="5" customClass="VLCBottomBarView"> <rect key="frame" x="0.0" y="0.0" width="363" height="36"/> <subviews> <customView translatesAutoresizingMaskIntoConstraints="NO" id="65" customClass="VLCDragDropView"> diff --git a/modules/gui/macosx/UI/MainWindow.xib b/modules/gui/macosx/UI/MainWindow.xib index 4bd27d4bc2..ad86ccb4e8 100644 --- a/modules/gui/macosx/UI/MainWindow.xib +++ b/modules/gui/macosx/UI/MainWindow.xib @@ -426,7 +426,7 @@ <constraint firstAttribute="trailing" secondItem="4680" secondAttribute="trailing" id="tFU-RQ-RnY"/> </constraints> </customView> - <customView translatesAutoresizingMaskIntoConstraints="NO" id="4756" customClass="VLCThreePartImageView"> + <customView translatesAutoresizingMaskIntoConstraints="NO" id="4756" customClass="VLCBottomBarView"> <rect key="frame" x="0.0" y="0.0" width="716" height="36"/> <subviews> <customView translatesAutoresizingMaskIntoConstraints="NO" id="5608" customClass="VLCDragDropView"> diff --git a/modules/gui/macosx/VLCControlsBarCommon.h b/modules/gui/macosx/VLCControlsBarCommon.h index af660cb757..ae4313c060 100644 --- a/modules/gui/macosx/VLCControlsBarCommon.h +++ b/modules/gui/macosx/VLCControlsBarCommon.h @@ -25,6 +25,7 @@ #import <Cocoa/Cocoa.h> #import "misc.h" +#import "VLCBottomBarView.h" #import "VLCTimeField.h" #import "VLCSlider.h" @@ -49,7 +50,7 @@ @property (readwrite, strong) IBOutlet NSButton *fullscreenButton; @property (readwrite, strong) IBOutlet NSLayoutConstraint *fullscreenButtonWidthConstraint; -@property (readwrite, strong) IBOutlet VLCThreePartImageView *bottomBarView; +@property (readwrite, strong) IBOutlet VLCBottomBarView *bottomBarView; @property (readonly) BOOL darkInterface; @property (readonly) BOOL nativeFullscreenMode; diff --git a/modules/gui/macosx/VLCControlsBarCommon.m b/modules/gui/macosx/VLCControlsBarCommon.m index 05cf41360c..b93b342edc 100644 --- a/modules/gui/macosx/VLCControlsBarCommon.m +++ b/modules/gui/macosx/VLCControlsBarCommon.m @@ -84,7 +84,7 @@ [[self.fullscreenButton cell] accessibilitySetOverrideValue:[self.fullscreenButton toolTip] forAttribute:NSAccessibilityTitleAttribute]; if (!_darkInterface) { - [self.bottomBarView setImagesLeft: imageFromRes(@"bottom-background") middle: imageFromRes(@"bottom-background") right: imageFromRes(@"bottom-background")]; + [self.bottomBarView setDark:NO]; [self.backwardButton setImage: imageFromRes(@"backward-3btns")]; [self.backwardButton setAlternateImage: imageFromRes(@"backward-3btns-pressed")]; @@ -98,7 +98,7 @@ [self.fullscreenButton setImage: imageFromRes(@"fullscreen-one-button")]; [self.fullscreenButton setAlternateImage: imageFromRes(@"fullscreen-one-button-pressed")]; } else { - [self.bottomBarView setImagesLeft: imageFromRes(@"bottomdark-left") middle: imageFromRes(@"bottom-background_dark") right: imageFromRes(@"bottomdark-right")]; + [self.bottomBarView setDark:YES]; [self.backwardButton setImage: imageFromRes(@"backward-3btns-dark")]; [self.backwardButton setAlternateImage: imageFromRes(@"backward-3btns-dark-pressed")]; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
