Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
cc306d36
Commit
cc306d36
authored
Feb 15, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fixed alignment issues in the main window's bottom bar
parent
a587c752
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
32 deletions
+42
-32
extras/package/macosx/Resources/English.lproj/MainMenu.xib
extras/package/macosx/Resources/English.lproj/MainMenu.xib
+30
-30
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+3
-1
modules/gui/macosx/misc.h
modules/gui/macosx/misc.h
+1
-0
modules/gui/macosx/misc.m
modules/gui/macosx/misc.m
+8
-1
No files found.
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @
cc306d36
This diff is collapsed.
Click to expand it.
modules/gui/macosx/MainWindow.m
View file @
cc306d36
...
...
@@ -253,6 +253,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
else
[
self
setContentMinSize
:
NSMakeSize
(
604
.,
288
.)];
[
self
setTitle
:
_NS
(
"VLC media player"
)];
[
o_time_fld
setAlignment
:
NSCenterTextAlignment
];
[
o_time_fld
setNeedsDisplay
:
YES
];
[
o_playlist_btn
setEnabled
:
NO
];
o_temp_view
=
[[
NSView
alloc
]
init
];
[
o_temp_view
setAutoresizingMask
:
NSViewHeightSizable
|
NSViewWidthSizable
];
...
...
@@ -260,8 +262,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
o_left_split_view
setFrame
:
[
o_sidebar_view
frame
]];
if
(
OSX_LION
&&
b_nativeFullscreenMode
)
{
[
self
setCollectionBehavior
:
NSWindowCollectionBehaviorFullScreenPrimary
];
NSRect
frame
;
[
self
setCollectionBehavior
:
NSWindowCollectionBehaviorFullScreenPrimary
];
float
f_width
=
[
o_fullscreen_btn
frame
].
size
.
width
;
#define moveItem( item ) \
...
...
modules/gui/macosx/misc.h
View file @
cc306d36
...
...
@@ -158,6 +158,7 @@
{
NSShadow
*
o_string_shadow
;
NSDictionary
*
o_string_attributes_dict
;
NSTextAlignment
textAlignment
;
}
-
(
BOOL
)
timeRemaining
;
...
...
modules/gui/macosx/misc.m
View file @
cc306d36
...
...
@@ -727,9 +727,16 @@ void _drawFrameInRect(NSRect frameRect)
else
o_string_color
=
[
NSColor
colorWithCalibratedRed
:
0
.
64
green
:
0
.
64
blue
:
0
.
64
alpha
:
100
.
0
];
textAlignment
=
NSCenterTextAlignment
;
o_string_attributes_dict
=
[[
NSDictionary
dictionaryWithObjectsAndKeys
:
o_string_color
,
NSForegroundColorAttributeName
,
[
NSFont
titleBarFontOfSize
:
10
.
0
],
NSFontAttributeName
,
nil
]
retain
];
}
-
(
void
)
setAlignment
:(
NSTextAlignment
)
alignment
{
textAlignment
=
alignment
;
[
self
setStringValue
:[
self
stringValue
]];
}
-
(
void
)
dealloc
{
[
o_string_shadow
release
];
...
...
@@ -750,7 +757,7 @@ void _drawFrameInRect(NSRect frameRect)
NSUInteger
i_stringLength
=
[
string
length
];
[
o_attributed_string
addAttribute
:
NSShadowAttributeName
value
:
o_string_shadow
range
:
NSMakeRange
(
0
,
i_stringLength
)];
[
o_attributed_string
setAlignment
:
NSRightT
extAlignment
range
:
NSMakeRange
(
0
,
i_stringLength
)];
[
o_attributed_string
setAlignment
:
t
extAlignment
range
:
NSMakeRange
(
0
,
i_stringLength
)];
[
self
setAttributedStringValue
:
o_attributed_string
];
[
o_attributed_string
release
];
}
...
...
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