videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

macosx: Use VLCBottomBarView

This commit is contained in:
Marvin Scholz 2017-08-15 21:54:10 +02:00
parent 3144986d63
commit 861680999d
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gui/macosx/UI/DetachedVideoWindow.xib
View File

@ -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">

2
modules/gui/macosx/UI/MainWindow.xib
View File

@ -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">

3
modules/gui/macosx/VLCControlsBarCommon.h
View File

@ -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;

4
modules/gui/macosx/VLCControlsBarCommon.m
View File

@ -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")];