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
cdb1a7b6
Commit
cdb1a7b6
authored
Oct 22, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: skip useless resize when starting video from minimal view (close #9510)
parent
8fdbf0f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
17 deletions
+20
-17
modules/gui/macosx/MainWindow.h
modules/gui/macosx/MainWindow.h
+0
-2
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+20
-15
No files found.
modules/gui/macosx/MainWindow.h
View file @
cdb1a7b6
...
...
@@ -119,8 +119,6 @@
-
(
void
)
toggleLeftSubSplitView
;
-
(
void
)
showDropZone
;
-
(
void
)
hideDropZone
;
-
(
void
)
showSplitView
;
-
(
void
)
hideSplitView
;
-
(
void
)
updateTimeSlider
;
-
(
void
)
updateWindow
;
-
(
void
)
updateName
;
...
...
modules/gui/macosx/MainWindow.m
View file @
cdb1a7b6
...
...
@@ -373,7 +373,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
mainSplitViewDidResizeSubviews
:
)
name
:
NSSplitViewDidResizeSubviewsNotification
object
:
o_split_view
];
if
(
b_splitviewShouldBeHidden
)
{
[
self
hideSplitView
];
[
self
hideSplitView
:
YES
];
i_lastSplitViewHeight
=
300
;
}
...
...
@@ -488,11 +488,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
||
(
b_nonembedded
&&
sender
!=
nil
)
||
(
!
b_activeVideo
&&
sender
!=
nil
)
||
b_minimized_view
))
[
self
hideSplitView
];
[
self
hideSplitView
:
sender
!=
nil
];
else
{
if
(
b_splitview_removed
)
{
if
(
!
b_nonembedded
||
(
sender
!=
nil
&&
b_nonembedded
))
[
self
showSplitView
];
[
self
showSplitView
:
sender
!=
nil
];
if
(
sender
==
nil
)
b_minimized_view
=
YES
;
...
...
@@ -577,13 +577,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
[[
o_playlist_table
animator
]
setHidden
:
NO
];
}
-
(
void
)
hideSplitView
-
(
void
)
hideSplitView
:(
BOOL
)
b_with_resize
{
NSRect
winrect
=
[
self
frame
];
i_lastSplitViewHeight
=
[
o_split_view
frame
].
size
.
height
;
winrect
.
size
.
height
=
winrect
.
size
.
height
-
i_lastSplitViewHeight
;
winrect
.
origin
.
y
=
winrect
.
origin
.
y
+
i_lastSplitViewHeight
;
[
self
setFrame
:
winrect
display
:
YES
animate
:
YES
];
if
(
b_with_resize
)
{
NSRect
winrect
=
[
self
frame
];
i_lastSplitViewHeight
=
[
o_split_view
frame
].
size
.
height
;
winrect
.
size
.
height
=
winrect
.
size
.
height
-
i_lastSplitViewHeight
;
winrect
.
origin
.
y
=
winrect
.
origin
.
y
+
i_lastSplitViewHeight
;
[
self
setFrame
:
winrect
display
:
YES
animate
:
YES
];
}
[
self
performSelector
:
@selector
(
hideDropZone
)
withObject
:
nil
afterDelay
:
0
.
1
];
if
(
b_dark_interface
)
{
[
self
setContentMinSize
:
NSMakeSize
(
604
.,
[
o_controls_bar
height
]
+
[
o_titlebar_view
frame
].
size
.
height
)];
...
...
@@ -596,7 +599,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
b_splitview_removed
=
YES
;
}
-
(
void
)
showSplitView
-
(
void
)
showSplitView
:(
BOOL
)
b_with_resize
{
[
self
updateWindow
];
if
(
b_dark_interface
)
...
...
@@ -605,11 +608,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
self
setContentMinSize
:
NSMakeSize
(
604
.,
288
.)];
[
self
setContentMaxSize
:
NSMakeSize
(
FLT_MAX
,
FLT_MAX
)];
NSRect
winrect
;
winrect
=
[
self
frame
];
winrect
.
size
.
height
=
winrect
.
size
.
height
+
i_lastSplitViewHeight
;
winrect
.
origin
.
y
=
winrect
.
origin
.
y
-
i_lastSplitViewHeight
;
[
self
setFrame
:
winrect
display
:
YES
animate
:
YES
];
if
(
b_with_resize
)
{
NSRect
winrect
;
winrect
=
[
self
frame
];
winrect
.
size
.
height
=
winrect
.
size
.
height
+
i_lastSplitViewHeight
;
winrect
.
origin
.
y
=
winrect
.
origin
.
y
-
i_lastSplitViewHeight
;
[
self
setFrame
:
winrect
display
:
YES
animate
:
YES
];
}
[
self
performSelector
:
@selector
(
resizePlaylistAfterCollapse
)
withObject
:
nil
afterDelay
:
0
.
75
];
...
...
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