Commit d5ba408f authored by Felix Paul Kühne's avatar Felix Paul Kühne

Menu: fix scrolling on iPhone (close #8730)

parent daf91847
......@@ -17,6 +17,7 @@
@property (strong, nonatomic) IASKAppSettingsViewController *settingsViewController;
@property (strong, nonatomic) VLCSettingsController *settingsController;
@property (strong, nonatomic) IBOutlet UIScrollView *scrollView;
@property (strong, nonatomic) IBOutlet UIToolbar *dismissToolBar;
@property (strong, nonatomic) IBOutlet UIButton *aboutButton;
@property (strong, nonatomic) IBOutlet UIButton *openNetworkStreamButton;
......
......@@ -59,6 +59,8 @@
self.dismissToolBar.items = @[[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil], dismissButton];
[self.dismissToolBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault];
self.scrollView.contentSize = self.view.frame.size;
}
[self.aboutButton setTitle:NSLocalizedString(@"ABOUT_APP", @"") forState:UIControlStateNormal];
[self.openNetworkStreamButton setTitle:NSLocalizedString(@"OPEN_NETWORK", @"") forState:UIControlStateNormal];
......
......@@ -748,6 +748,7 @@
<string key="openURLButton">UIButton</string>
<string key="openURLField">UITextField</string>
<string key="openURLView">UIView</string>
<string key="scrollView">UIScrollView</string>
<string key="settingsButton">UIButton</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
......@@ -799,6 +800,10 @@
<string key="name">openURLView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="scrollView">
<string key="name">scrollView</string>
<string key="candidateClassName">UIScrollView</string>
</object>
<object class="IBToOneOutletInfo" key="settingsButton">
<string key="name">settingsButton</string>
<string key="candidateClassName">UIButton</string>
......
......@@ -527,6 +527,14 @@
</object>
<int key="connectionID">87</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">scrollView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="197151749"/>
</object>
<int key="connectionID">89</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">openNetworkStream:</string>
......@@ -764,7 +772,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">88</int>
<int key="maxID">89</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -831,6 +839,7 @@
<string key="openURLButton">UIButton</string>
<string key="openURLField">UITextField</string>
<string key="openURLView">UIView</string>
<string key="scrollView">UIScrollView</string>
<string key="settingsButton">UIButton</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
......@@ -882,6 +891,10 @@
<string key="name">openURLView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="scrollView">
<string key="name">scrollView</string>
<string key="candidateClassName">UIScrollView</string>
</object>
<object class="IBToOneOutletInfo" key="settingsButton">
<string key="name">settingsButton</string>
<string key="candidateClassName">UIButton</string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment