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
429732ce
Commit
429732ce
authored
Jan 11, 2013
by
Ken Thomases
Committed by
Alexandre Julliard
Jan 11, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac: Implement support for WS_EX_TOPMOST windows.
parent
9d29ea42
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
1 deletion
+12
-1
cocoa_window.h
dlls/winemac.drv/cocoa_window.h
+1
-0
cocoa_window.m
dlls/winemac.drv/cocoa_window.m
+9
-1
macdrv_cocoa.h
dlls/winemac.drv/macdrv_cocoa.h
+1
-0
window.c
dlls/winemac.drv/window.c
+1
-0
No files found.
dlls/winemac.drv/cocoa_window.h
View file @
429732ce
...
...
@@ -26,6 +26,7 @@
NSUInteger
normalStyleMask
;
BOOL
disabled
;
BOOL
noActivate
;
BOOL
floating
;
}
@end
dlls/winemac.drv/cocoa_window.m
View file @
429732ce
...
...
@@ -62,6 +62,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens)
@property
(
nonatomic
)
BOOL
disabled
;
@property
(
nonatomic
)
BOOL
noActivate
;
@property
(
nonatomic
)
BOOL
floating
;
+
(
void
)
flipRect
:(
NSRect
*
)
rect
;
...
...
@@ -80,7 +81,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens)
@implementation
WineWindow
@synthesize
disabled
,
noActivate
;
@synthesize
disabled
,
noActivate
,
floating
;
+
(
WineWindow
*
)
createWindowWithFeatures
:(
const
struct
macdrv_window_features
*
)
wf
windowFrame
:(
NSRect
)
window_frame
...
...
@@ -147,8 +148,15 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens)
-
(
void
)
setMacDrvState
:
(
const
struct
macdrv_window_state
*
)
state
{
NSInteger
level
;
self
.
disabled
=
state
->
disabled
;
self
.
noActivate
=
state
->
no_activate
;
self
.
floating
=
state
->
floating
;
level
=
state
->
floating
?
NSFloatingWindowLevel
:
NSNormalWindowLevel
;
if
(
level
!=
[
self
level
])
[
self
setLevel
:
level
];
}
/* Returns whether or not the window was ordered in, which depends on if
...
...
dlls/winemac.drv/macdrv_cocoa.h
View file @
429732ce
...
...
@@ -128,6 +128,7 @@ struct macdrv_window_features {
struct
macdrv_window_state
{
unsigned
int
disabled
:
1
;
unsigned
int
no_activate
:
1
;
unsigned
int
floating
:
1
;
};
extern
macdrv_window
macdrv_create_cocoa_window
(
const
struct
macdrv_window_features
*
wf
,
...
...
dlls/winemac.drv/window.c
View file @
429732ce
...
...
@@ -103,6 +103,7 @@ static void get_cocoa_window_state(struct macdrv_win_data *data,
memset
(
state
,
0
,
sizeof
(
*
state
));
state
->
disabled
=
(
style
&
WS_DISABLED
)
!=
0
;
state
->
no_activate
=
!
can_activate_window
(
data
->
hwnd
);
state
->
floating
=
(
ex_style
&
WS_EX_TOPMOST
)
!=
0
;
}
...
...
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