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
8d4fcc60
Commit
8d4fcc60
authored
Dec 11, 2013
by
Felix Paul Kühne
Browse files
fix cloud storage logo layout failure on iOS 6 and iPad (close #10080)
parent
7de5ebf1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Resources/VLCCloudStorageTableViewController.xib
View file @
8d4fcc60
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"
4514
"
systemVersion=
"1
3A603
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"
5023
"
systemVersion=
"1
2F45
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<dependencies>
<deployment
version=
"1296"
defaultVersion=
"1552"
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"37
47
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"37
33
"
/>
</dependencies>
<objects>
<placeholder
placeholderIdentifier=
"IBFilesOwner"
id=
"-1"
userLabel=
"File's Owner"
customClass=
"VLCCloudStorageTableViewController"
>
...
...
@@ -40,7 +40,7 @@
<subviews>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
image=
"dropbox-white.png"
id=
"9"
>
<rect
key=
"frame"
x=
"70"
y=
"192"
width=
"179"
height=
"60"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<autoresizingMask
key=
"autoresizingMask"
flexibleMinX=
"YES"
flexibleMaxX=
"YES"
flexibleMinY=
"YES"
flexibleMaxY=
"YES"
/>
</imageView>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
lineBreakMode=
"middleTruncation"
id=
"20"
customClass=
"VLCMenuButton"
>
<rect
key=
"frame"
x=
"120"
y=
"387"
width=
"81"
height=
"39"
/>
...
...
@@ -66,4 +66,4 @@
<image
name=
"dropbox-white.png"
width=
"125"
height=
"42"
/>
<image
name=
"menuButton.png"
width=
"63"
height=
"39"
/>
</resources>
</document>
\ No newline at end of file
</document>
Sources/VLCDropboxTableViewController.m
View file @
8d4fcc60
...
...
@@ -76,8 +76,6 @@
[
_downloadingBarLabel
setTitleTextAttributes
:@{
UITextAttributeFont
:
[
UIFont
systemFontOfSize
:
11
.]
}
forState
:
UIControlStateNormal
];
[
self
.
cloudStorageLogo
setImage
:[
UIImage
imageNamed
:
@"dropbox-white.png"
]];
[
self
.
cloudStorageLogo
sizeToFit
];
self
.
cloudStorageLogo
.
center
=
self
.
view
.
center
;
[
self
.
loginButton
setTitle
:
NSLocalizedString
(
@"DROPBOX_LOGIN"
,
@""
)
forState
:
UIControlStateNormal
];
[
self
.
navigationController
.
toolbar
setBackgroundImage
:[
UIImage
imageNamed
:
@"sudHeaderBg"
]
forToolbarPosition
:
UIToolbarPositionAny
barMetrics
:
UIBarMetricsDefault
];
...
...
@@ -103,6 +101,9 @@
aiFrame
.
origin
.
x
=
(
tvSize
.
width
-
aiFrame
.
size
.
width
)
/
2
.;
aiFrame
.
origin
.
y
=
(
tvSize
.
height
-
aiFrame
.
size
.
height
)
/
2
.;
_activityIndicator
.
frame
=
aiFrame
;
[
self
.
cloudStorageLogo
sizeToFit
];
self
.
cloudStorageLogo
.
center
=
self
.
view
.
center
;
}
-
(
void
)
viewWillDisappear
:(
BOOL
)
animated
...
...
Sources/VLCGoogleDriveTableViewController.m
View file @
8d4fcc60
...
...
@@ -75,8 +75,6 @@
[
_downloadingBarLabel
setTitleTextAttributes
:@{
UITextAttributeFont
:
[
UIFont
systemFontOfSize
:
11
.]
}
forState
:
UIControlStateNormal
];
[
self
.
cloudStorageLogo
setImage
:[
UIImage
imageNamed
:
@"DriveWhite"
]];
[
self
.
cloudStorageLogo
sizeToFit
];
self
.
cloudStorageLogo
.
center
=
self
.
view
.
center
;
[
self
.
loginButton
setTitle
:
NSLocalizedString
(
@"DROPBOX_LOGIN"
,
@""
)
forState
:
UIControlStateNormal
];
...
...
@@ -137,6 +135,9 @@
aiFrame
.
origin
.
x
=
(
tvSize
.
width
-
aiFrame
.
size
.
width
)
/
2
.;
aiFrame
.
origin
.
y
=
(
tvSize
.
height
-
aiFrame
.
size
.
height
)
/
2
.;
_activityIndicator
.
frame
=
aiFrame
;
[
self
.
cloudStorageLogo
sizeToFit
];
self
.
cloudStorageLogo
.
center
=
self
.
view
.
center
;
}
-
(
void
)
viewWillDisappear
:(
BOOL
)
animated
...
...
Write
Preview
Supports
Markdown
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