Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
3799acb3
Commit
3799acb3
authored
Feb 17, 2013
by
Ken Thomases
Committed by
Alexandre Julliard
Feb 18, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac: Use only on-screen windows for Cocoa parent (Win32 owner) and ordering sibling.
parent
d74e9008
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
window.c
dlls/winemac.drv/window.c
+8
-6
No files found.
dlls/winemac.drv/window.c
View file @
3799acb3
...
...
@@ -303,10 +303,12 @@ static void release_win_data(struct macdrv_win_data *data)
*
* Return the Mac window associated with the full area of a window
*/
static
macdrv_window
macdrv_get_cocoa_window
(
HWND
hwnd
)
static
macdrv_window
macdrv_get_cocoa_window
(
HWND
hwnd
,
BOOL
require_on_screen
)
{
struct
macdrv_win_data
*
data
=
get_win_data
(
hwnd
);
macdrv_window
ret
=
data
?
data
->
cocoa_window
:
NULL
;
macdrv_window
ret
=
NULL
;
if
(
data
&&
(
data
->
on_screen
||
!
require_on_screen
))
ret
=
data
->
cocoa_window
;
release_win_data
(
data
);
return
ret
;
}
...
...
@@ -330,7 +332,7 @@ static void set_cocoa_window_properties(struct macdrv_win_data *data)
ex_style
=
GetWindowLongW
(
data
->
hwnd
,
GWL_EXSTYLE
);
owner
=
GetWindow
(
data
->
hwnd
,
GW_OWNER
);
owner_win
=
macdrv_get_cocoa_window
(
owner
);
owner_win
=
macdrv_get_cocoa_window
(
owner
,
TRUE
);
macdrv_set_cocoa_parent_window
(
data
->
cocoa_window
,
owner_win
);
get_cocoa_window_features
(
data
,
style
,
ex_style
,
&
wf
);
...
...
@@ -698,14 +700,14 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags)
/* find window that this one must be after */
HWND
prev
=
GetWindow
(
data
->
hwnd
,
GW_HWNDPREV
);
while
(
prev
&&
!
((
GetWindowLongW
(
prev
,
GWL_STYLE
)
&
WS_VISIBLE
)
&&
(
prev_window
=
macdrv_get_cocoa_window
(
prev
))))
(
prev_window
=
macdrv_get_cocoa_window
(
prev
,
TRUE
))))
prev
=
GetWindow
(
prev
,
GW_HWNDPREV
);
if
(
!
prev_window
)
{
/* find window that this one must be before */
next
=
GetWindow
(
data
->
hwnd
,
GW_HWNDNEXT
);
while
(
next
&&
!
((
GetWindowLongW
(
next
,
GWL_STYLE
)
&
WS_VISIBLE
)
&&
(
next_window
=
macdrv_get_cocoa_window
(
next
))))
(
next_window
=
macdrv_get_cocoa_window
(
next
,
TRUE
))))
next
=
GetWindow
(
next
,
GW_HWNDNEXT
);
}
...
...
@@ -988,7 +990,7 @@ void CDECL macdrv_SetWindowText(HWND hwnd, LPCWSTR text)
TRACE
(
"%p, %s
\n
"
,
hwnd
,
debugstr_w
(
text
));
if
((
win
=
macdrv_get_cocoa_window
(
hwnd
)))
if
((
win
=
macdrv_get_cocoa_window
(
hwnd
,
FALSE
)))
macdrv_set_cocoa_window_title
(
win
,
text
,
strlenW
(
text
));
}
...
...
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