[vlc-devel] [PATCH 6/8] macosx: Remove no longer required outlets to views
Marvin Scholz
epirat07 at gmail.com
Tue Jul 18 20:30:09 CEST 2017
---
modules/gui/macosx/VLCControlsBarCommon.h | 4 ----
modules/gui/macosx/VLCControlsBarCommon.m | 21 ---------------------
2 files changed, 25 deletions(-)
diff --git a/modules/gui/macosx/VLCControlsBarCommon.h b/modules/gui/macosx/VLCControlsBarCommon.h
index ed4820deb1..eac80f6df2 100644
--- a/modules/gui/macosx/VLCControlsBarCommon.h
+++ b/modules/gui/macosx/VLCControlsBarCommon.h
@@ -43,11 +43,7 @@
@property (readwrite, strong) IBOutlet NSButton *backwardButton;
@property (readwrite, strong) IBOutlet NSButton *forwardButton;
- at property (readwrite, strong) IBOutlet VLCProgressView *progressView;
@property (readwrite, strong) IBOutlet VLCSlider *timeSlider;
- at property (readwrite, strong) IBOutlet VLCThreePartImageView *timeSliderGradientView;
- at property (readwrite, strong) IBOutlet VLCThreePartImageView *timeSliderBackgroundView;
- at property (readwrite, strong) IBOutlet NSProgressIndicator *progressBar;
@property (readwrite, strong) IBOutlet VLCTimeField *timeField;
@property (readwrite, strong) IBOutlet NSButton *fullscreenButton;
diff --git a/modules/gui/macosx/VLCControlsBarCommon.m b/modules/gui/macosx/VLCControlsBarCommon.m
index 3fa200967c..63cac682ee 100644
--- a/modules/gui/macosx/VLCControlsBarCommon.m
+++ b/modules/gui/macosx/VLCControlsBarCommon.m
@@ -91,9 +91,6 @@ - (void)awakeFromNib
[self.forwardButton setImage: imageFromRes(@"forward-3btns")];
[self.forwardButton setAlternateImage: imageFromRes(@"forward-3btns-pressed")];
- [self.timeSliderBackgroundView setImagesLeft: imageFromRes(@"progression-track-wrapper-left") middle: imageFromRes(@"progression-track-wrapper-middle") right: imageFromRes(@"progression-track-wrapper-right")];
- [self.timeSliderGradientView setImagesLeft:imageFromRes(@"progression-fill-left") middle:imageFromRes(@"progression-fill-middle") right:imageFromRes(@"progression-fill-right")];
-
[self.fullscreenButton setImage: imageFromRes(@"fullscreen-one-button")];
[self.fullscreenButton setAlternateImage: imageFromRes(@"fullscreen-one-button-pressed")];
} else {
@@ -108,9 +105,6 @@ - (void)awakeFromNib
[self.forwardButton setImage: imageFromRes(@"forward-3btns-dark")];
[self.forwardButton setAlternateImage: imageFromRes(@"forward-3btns-dark-pressed")];
- [self.timeSliderBackgroundView setImagesLeft: imageFromRes(@"progression-track-wrapper-left_dark") middle: imageFromRes(@"progression-track-wrapper-middle_dark") right: imageFromRes(@"progression-track-wrapper-right_dark")];
- [self.timeSliderGradientView setImagesLeft:imageFromRes(@"progressbar-fill-left_dark") middle:imageFromRes(@"progressbar-fill-middle_dark") right:imageFromRes(@"progressbar-fill-right_dark")];
-
[self.fullscreenButton setImage: imageFromRes(@"fullscreen-one-button-pressed_dark")];
[self.fullscreenButton setAlternateImage: imageFromRes(@"fullscreen-one-button-pressed_dark")];
}
@@ -129,21 +123,6 @@ - (void)awakeFromNib
[self.timeField setNeedsDisplay:YES];
[self.timeField setRemainingIdentifier:@"DisplayTimeAsTimeRemaining"];
- // prepare time slider fance gradient view
- self.timeSliderGradientView.translatesAutoresizingMaskIntoConstraints = YES;
- if (!_darkInterface) {
- NSRect frame;
- frame = [self.timeSliderGradientView frame];
- frame.size.height = frame.size.height - 1;
- frame.origin.y = frame.origin.y + 1;
- [self.timeSliderGradientView setFrame: frame];
- }
-
- NSRect frame;
- frame = [_timeSliderGradientView frame];
- frame.size.width = 0;
- [_timeSliderGradientView setFrame: frame];
-
// remove fullscreen button for lion fullscreen
if (_nativeFullscreenMode) {
[self.fullscreenButton removeFromSuperview];
--
2.11.0 (Apple Git-81)
More information about the vlc-devel
mailing list