Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
b285c570
Commit
b285c570
authored
Jun 04, 2013
by
Ken Thomases
Committed by
Alexandre Julliard
Jun 04, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac: Defer minimizing hidden windows until they are shown.
Minimizing invisible windows causes weird phantoms to appear in Exposé, the Window menu, and the Dock.
parent
841f158d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
2 deletions
+32
-2
cocoa_window.h
dlls/winemac.drv/cocoa_window.h
+1
-0
cocoa_window.m
dlls/winemac.drv/cocoa_window.m
+31
-2
No files found.
dlls/winemac.drv/cocoa_window.h
View file @
b285c570
...
...
@@ -29,6 +29,7 @@
BOOL
disabled
;
BOOL
noActivate
;
BOOL
floating
;
BOOL
pendingMinimize
;
WineWindow
*
latentParentWindow
;
void
*
hwnd
;
...
...
dlls/winemac.drv/cocoa_window.m
View file @
b285c570
...
...
@@ -636,10 +636,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
}
[
self
setCollectionBehavior
:
behavior
];
pendingMinimize
=
FALSE
;
if
(
state
->
minimized
&&
!
[
self
isMiniaturized
])
{
ignore_windowMiniaturize
=
TRUE
;
[
self
miniaturize
:
nil
];
if
([
self
isVisible
])
{
ignore_windowMiniaturize
=
TRUE
;
[
self
miniaturize
:
nil
];
}
else
pendingMinimize
=
TRUE
;
}
else
if
(
!
state
->
minimized
&&
[
self
isMiniaturized
])
{
...
...
@@ -754,6 +760,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
if
(
needAdjustWindowLevels
)
[
controller
adjustWindowLevels
];
if
(
pendingMinimize
)
{
ignore_windowMiniaturize
=
TRUE
;
[
self
miniaturize
:
nil
];
pendingMinimize
=
FALSE
;
}
NSEnableScreenUpdates
();
/* Cocoa may adjust the frame when the window is ordered onto the screen.
...
...
@@ -770,6 +783,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
-
(
void
)
doOrderOut
{
if
([
self
isMiniaturized
])
pendingMinimize
=
TRUE
;
self
.
latentParentWindow
=
[
self
parentWindow
];
[
latentParentWindow
removeChildWindow
:
self
];
[
self
orderOut
:
nil
];
...
...
@@ -948,6 +963,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
[
self
orderFront
:
nil
];
[
controller
adjustWindowLevels
];
if
(
pendingMinimize
)
{
ignore_windowMiniaturize
=
TRUE
;
[
self
miniaturize
:
nil
];
pendingMinimize
=
FALSE
;
}
NSEnableScreenUpdates
();
causing_becomeKeyWindow
=
TRUE
;
...
...
@@ -1057,6 +1079,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
[
self
setLevel
:[
front
level
]];
[
self
orderFront
:
nil
];
[
controller
adjustWindowLevels
];
if
(
pendingMinimize
)
{
ignore_windowMiniaturize
=
TRUE
;
[
self
miniaturize
:
nil
];
pendingMinimize
=
FALSE
;
}
}
-
(
void
)
sendEvent
:
(
NSEvent
*
)
event
...
...
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