Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
e908f36f
Commit
e908f36f
authored
Apr 10, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: make sure that the main window's split view is correctly resized on relaunch (close #6597)
parent
1dcc6e6f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
29 deletions
+16
-29
extras/package/macosx/Resources/English.lproj/MainMenu.xib
extras/package/macosx/Resources/English.lproj/MainMenu.xib
+9
-10
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+7
-2
modules/gui/macosx/misc.m
modules/gui/macosx/misc.m
+0
-17
No files found.
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @
e908f36f
...
...
@@ -21,16 +21,16 @@
</object>
<object
class=
"NSMutableArray"
key=
"IBDocument.EditedObjectIDs"
>
<bool
key=
"EncodedWithXMLCoder"
>
YES
</bool>
<integer
value=
"4850"
/>
<integer
value=
"29"
/>
<integer
value=
"4948"
/>
<integer
value=
"915"
/>
<integer
value=
"2770"
/>
<integer
value=
"2730"
/>
<integer
value=
"4722"
/>
<integer
value=
"4596"
/>
<integer
value=
"2"
/>
<integer
value=
"29"
/>
<integer
value=
"2730"
/>
<integer
value=
"915"
/>
<integer
value=
"4948"
/>
<integer
value=
"1617"
/>
<integer
value=
"4713"
/>
<integer
value=
"4850"
/>
<integer
value=
"2770"
/>
</object>
<object
class=
"NSArray"
key=
"IBDocument.PluginDependencies"
>
<bool
key=
"EncodedWithXMLCoder"
>
YES
</bool>
...
...
@@ -604,7 +604,6 @@
<int
key=
"NSViewLayerContentsRedrawPolicy"
>
2
</int>
<bool
key=
"NSIsVertical"
>
YES
</bool>
<int
key=
"NSDividerStyle"
>
2
</int>
<string
key=
"NSAutosaveName"
>
10thanniversary-splitview
</string>
</object>
<object
class=
"NSCustomView"
id=
"515305233"
>
<reference
key=
"NSNextResponder"
ref=
"429932428"
/>
...
...
@@ -12064,9 +12063,9 @@ LCAuLi4</string>
<string>
{{430, 565}, {137, 103}}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<boolean
value=
"YES"
/>
<string>
{{36
4
, 446}, {604, 310}}
</string>
<string>
{{36
3
, 446}, {604, 310}}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<string>
{{36
4
, 446}, {604, 310}}
</string>
<string>
{{36
3
, 446}, {604, 310}}
</string>
<boolean
value=
"YES"
/>
<boolean
value=
"NO"
/>
<boolean
value=
"NO"
/>
...
...
modules/gui/macosx/MainWindow.m
View file @
e908f36f
...
...
@@ -546,6 +546,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
applicationWillTerminate
:
)
name
:
NSApplicationWillTerminateNotification
object
:
nil
];
[[
VLCMain
sharedInstance
]
playbackModeUpdated
];
[
o_split_view
setAutosaveName
:
@"10thanniversary-splitview"
];
if
(
b_splitviewShouldBeHidden
)
{
i_lastSplitViewHeight
=
[
o_split_view
frame
].
size
.
height
;
...
...
@@ -1091,7 +1092,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
return
proposedFrameSize
;
}
#pragma mark -
#pragma mark Update interface and respond to foreign events
-
(
void
)
showDropZone
...
...
@@ -2070,11 +2070,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
-
(
CGFloat
)
splitView
:(
NSSplitView
*
)
splitView
constrainMaxCoordinate
:(
CGFloat
)
proposedMax
ofSubviewAt
:(
NSInteger
)
dividerIndex
{
if
(
dividerIndex
==
0
)
return
([
self
frame
].
size
.
width
-
400
.
0
)
;
return
300
.
;
else
return
proposedMax
;
}
-
(
BOOL
)
splitView
:(
NSSplitView
*
)
splitView
canCollapseSubview
:(
NSView
*
)
subview
{
return
([
subview
isEqual
:
o_left_split_view
]);
}
#pragma mark -
#pragma mark Side Bar Data handling
/* taken under BSD-new from the PXSourceList sample project, adapted for VLC */
...
...
modules/gui/macosx/misc.m
View file @
e908f36f
...
...
@@ -686,23 +686,6 @@ void _drawFrameInRect(NSRect frameRect)
{
return
1
.
0
;
}
-
(
void
)
adjustSubviews
{
NSArray
*
o_subviews
=
[
self
subviews
];
NSRect
viewDimensions
=
[
self
frame
];
NSRect
leftViewDimensions
=
[[
o_subviews
objectAtIndex
:
0
]
frame
];
NSRect
rightViewDimensions
=
[[
o_subviews
objectAtIndex
:
1
]
frame
];
CGFloat
f_dividerThickness
=
[
self
dividerThickness
];
leftViewDimensions
.
size
.
height
=
viewDimensions
.
size
.
height
;
[[
o_subviews
objectAtIndex
:
0
]
setFrame
:
leftViewDimensions
];
rightViewDimensions
.
origin
.
x
=
leftViewDimensions
.
size
.
width
+
f_dividerThickness
;
rightViewDimensions
.
size
.
width
=
viewDimensions
.
size
.
width
-
leftViewDimensions
.
size
.
width
-
f_dividerThickness
;
rightViewDimensions
.
size
.
height
=
viewDimensions
.
size
.
height
;
[[
o_subviews
objectAtIndex
:
1
]
setFrame
:
rightViewDimensions
];
}
@end
/*****************************************************************************
...
...
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