Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLC-iOS
Commits
d5ba408f
Commit
d5ba408f
authored
May 31, 2013
by
Felix Paul Kühne
Browse files
Menu: fix scrolling on iPhone (close #8730)
parent
daf91847
Changes
4
Hide whitespace changes
Inline
Side-by-side
AspenProject/VLCMenuViewController.h
View file @
d5ba408f
...
...
@@ -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
;
...
...
AspenProject/VLCMenuViewController.m
View file @
d5ba408f
...
...
@@ -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
];
...
...
Resources/VLCMenuViewController~ipad.xib
View file @
d5ba408f
...
...
@@ -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>
...
...
Resources/VLCMenuViewController~iphone.xib
View file @
d5ba408f
...
...
@@ -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"
>
8
8
</int>
<int
key=
"maxID"
>
8
9
</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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment