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
b755674d
Commit
b755674d
authored
Aug 26, 2013
by
Ken Thomases
Committed by
Alexandre Julliard
Aug 27, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac: Don't unminimize a window for SetFocus().
parent
5c0b5f4d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
57 deletions
+1
-57
cocoa_window.m
dlls/winemac.drv/cocoa_window.m
+1
-57
No files found.
dlls/winemac.drv/cocoa_window.m
View file @
b755674d
...
...
@@ -1026,67 +1026,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
-
(
void
)
makeFocused
:
(
BOOL
)
activate
{
WineApplicationController
*
controller
=
[
WineApplicationController
sharedController
];
NSArray
*
screens
;
WineWindow
*
front
;
BOOL
wasVisible
=
[
self
isVisible
];
[
controller
transformProcessToForeground
];
/* If a borderless window is offscreen, orderFront: won't move
it onscreen like it would for a titled window. Do that ourselves. */
screens
=
[
NSScreen
screens
];
if
(
!
([
self
styleMask
]
&
NSTitledWindowMask
)
&&
!
[
self
isOrderedIn
]
&&
!
frame_intersects_screens
([
self
frame
],
screens
))
{
NSScreen
*
primaryScreen
=
[
screens
objectAtIndex
:
0
];
NSRect
frame
=
[
primaryScreen
frame
];
[
self
setFrameTopLeftPoint
:
NSMakePoint
(
NSMinX
(
frame
),
NSMaxY
(
frame
))];
frame
=
[
self
constrainFrameRect
:[
self
frame
]
toScreen
:
primaryScreen
];
[
self
setFrame
:
frame
display
:
YES
];
[
self
updateColorSpace
];
}
if
(
activate
)
[
NSApp
activateIgnoringOtherApps
:
YES
];
NSDisableScreenUpdates
();
if
(
latentParentWindow
)
{
if
([
latentParentWindow
level
]
>
[
self
level
])
[
self
setLevel
:[
latentParentWindow
level
]];
[
latentParentWindow
addChildWindow
:
self
ordered
:
NSWindowAbove
];
self
.
latentParentWindow
=
nil
;
}
front
=
[
controller
frontWineWindow
];
if
(
front
&&
[
self
level
]
<
[
front
level
])
[
self
setLevel
:[
front
level
]];
[
self
orderFront
:
nil
];
if
(
!
wasVisible
&&
fullscreen
&&
[
self
isOnActiveSpace
])
[
controller
updateFullscreenWindows
];
[
controller
adjustWindowLevels
];
if
(
pendingMinimize
)
{
ignore_windowMiniaturize
=
TRUE
;
[
self
miniaturize
:
nil
];
pendingMinimize
=
FALSE
;
}
NSEnableScreenUpdates
();
[
self
orderBelow
:
nil
orAbove
:
nil
activate
:
activate
];
causing_becomeKeyWindow
=
TRUE
;
[
self
makeKeyWindow
];
causing_becomeKeyWindow
=
FALSE
;
if
(
!
[
self
isExcludedFromWindowsMenu
])
[
NSApp
addWindowsItem
:
self
title
:[
self
title
]
filename
:
NO
];
/* Cocoa may adjust the frame when the window is ordered onto the screen.
Generate a frame-changed event just in case. The back end will ignore
it if nothing actually changed. */
[
self
windowDidResize
:
nil
];
}
-
(
void
)
postKey
:
(
uint16_t
)
keyCode
...
...
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