Bläddra i källkod

movie view: improve control overlay behavior (closes #14809, #14817)

(cherry picked from commit 29bb59ad8c56028bd22cbb1be115bd8a1fbc08c7)
Felix Paul Kühne 10 år sedan
förälder
incheckning
7d182bc69d
1 ändrade filer med 21 tillägg och 1 borttagningar
  1. 21 1
      Sources/VLCMovieViewController.m

+ 21 - 1
Sources/VLCMovieViewController.m

@@ -340,7 +340,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
         width = 300.;
         height = 320.;
     } else {
-        width = 450.;
+        width = 420.;
         height = 470.;
     }
 
@@ -526,6 +526,9 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
     if (!_videoFiltersHidden)
         _videoFiltersHidden = YES;
 
+    if (_equalizerView.hidden == NO)
+        _equalizerView.hidden = YES;
+
     if (!_playbackSpeedViewHidden)
         _playbackSpeedViewHidden = YES;
 
@@ -675,6 +678,9 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
     if (!_videoFiltersHidden)
         _videoFiltersHidden = YES;
 
+    if (_equalizerView.hidden == NO)
+        _equalizerView.hidden = YES;
+
     if (!_playbackSpeedViewHidden)
         _playbackSpeedViewHidden = YES;
 
@@ -944,6 +950,9 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 
         [_trackSelectorTableView reloadData];
 
+        if (_equalizerView.hidden == NO)
+            _equalizerView.hidden = YES;
+
         if (!_playbackSpeedViewHidden)
             self.playbackSpeedView.hidden = _playbackSpeedViewHidden = YES;
 
@@ -1073,6 +1082,8 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
             }
         }
 
+        _trackSelectorContainer.hidden = YES;
+
         self.videoFilterView.hidden = _videoFiltersHidden = YES;
         _equalizerView.alpha = 1.;
         _equalizerView.hidden = NO;
@@ -1091,6 +1102,9 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
         _trackSelectorContainer.hidden = NO;
         _trackSelectorContainer.alpha = 1.;
 
+        if (_equalizerView.hidden == NO)
+            _equalizerView.hidden = YES;
+
         if (!_playbackSpeedViewHidden)
             self.playbackSpeedView.hidden = _playbackSpeedViewHidden = YES;
 
@@ -1468,6 +1482,9 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
     if (!_playbackSpeedViewHidden)
         self.playbackSpeedView.hidden = _playbackSpeedViewHidden = YES;
 
+    if (_equalizerView.hidden == NO)
+        _equalizerView.hidden = YES;
+
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
         if (!_controlsHidden) {
             self.controllerPanel.hidden = _controlsHidden = YES;
@@ -1544,6 +1561,9 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
         if (!_videoFiltersHidden)
             self.videoFilterView.hidden = _videoFiltersHidden = YES;
 
+        if (_equalizerView.hidden == NO)
+            _equalizerView.hidden = YES;
+
         self.playbackSpeedView.hidden = !_playbackSpeedViewHidden;
         _playbackSpeedViewHidden = self.playbackSpeedView.hidden;
         [self _resetIdleTimer];