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
d8325077
Commit
d8325077
authored
Jan 24, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: make sure the main window's position is correctly restored (fixes #5856)
parent
97fbfd88
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+4
-8
No files found.
modules/gui/macosx/MainWindow.m
View file @
d8325077
...
@@ -411,16 +411,15 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -411,16 +411,15 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
self
setOpaque
:
NO
];
[
self
setOpaque
:
NO
];
[
self
setHasShadow
:
YES
];
[
self
setHasShadow
:
YES
];
NSRect
winrect
;
NSRect
winrect
=
[
self
frame
]
;
CGFloat
f_titleBarHeight
=
[
o_titlebar_view
frame
].
size
.
height
;
CGFloat
f_titleBarHeight
=
[
o_titlebar_view
frame
].
size
.
height
;
winrect
=
[
self
frame
];
[
o_titlebar_view
setFrame
:
NSMakeRect
(
0
,
winrect
.
size
.
height
-
f_titleBarHeight
,
[
o_titlebar_view
setFrame
:
NSMakeRect
(
0
,
winrect
.
size
.
height
-
f_titleBarHeight
,
winrect
.
size
.
width
,
f_titleBarHeight
)];
winrect
.
size
.
width
,
f_titleBarHeight
)];
[[
self
contentView
]
addSubview
:
o_titlebar_view
];
[[
self
contentView
]
addSubview
:
o_titlebar_view
];
winrect
.
size
.
height
=
winrect
.
size
.
height
+
f_titleBarHeight
;
[
self
setFrame
:
winrect
display
:
YES
animate
:
YES
]
;
[
self
setFrame
:
winrect
display
:
NO
animate
:
NO
]
;
previousSavedFrame
=
winrect
;
winrect
=
[
o_split_view
frame
];
winrect
=
[
o_split_view
frame
];
winrect
.
size
.
height
=
winrect
.
size
.
height
-
f_titleBarHeight
;
winrect
.
size
.
height
=
winrect
.
size
.
height
-
f_titleBarHeight
;
[
o_split_view
setFrame
:
winrect
];
[
o_split_view
setFrame
:
winrect
];
...
@@ -429,10 +428,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -429,10 +428,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
o_color_backdrop
=
[[
VLCColorView
alloc
]
initWithFrame
:
[
o_split_view
frame
]];
o_color_backdrop
=
[[
VLCColorView
alloc
]
initWithFrame
:
[
o_split_view
frame
]];
[[
self
contentView
]
addSubview
:
o_color_backdrop
positioned
:
NSWindowBelow
relativeTo
:
o_split_view
];
[[
self
contentView
]
addSubview
:
o_color_backdrop
positioned
:
NSWindowBelow
relativeTo
:
o_split_view
];
[
o_color_backdrop
setAutoresizingMask
:
NSViewHeightSizable
|
NSViewWidthSizable
];
[
o_color_backdrop
setAutoresizingMask
:
NSViewHeightSizable
|
NSViewWidthSizable
];
previousSavedFrame
=
winrect
;
[
self
display
];
}
}
else
else
{
{
...
@@ -891,6 +886,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -891,6 +886,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
-
(
void
)
windowResizedOrMoved
:(
NSNotification
*
)
notification
-
(
void
)
windowResizedOrMoved
:(
NSNotification
*
)
notification
{
{
previousSavedFrame
=
[
self
frame
];
[
self
saveFrameUsingName
:
[
self
frameAutosaveName
]];
[
self
saveFrameUsingName
:
[
self
frameAutosaveName
]];
}
}
...
...
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