Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
15d4b2ab
Commit
15d4b2ab
authored
12 years ago
by
Ken Thomases
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
winemac: Translate presence in Windows task bar to participation in Exposé and window cycling.
parent
b6544d19
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/winemac.drv/cocoa_window.m
+12
-0
12 additions, 0 deletions
dlls/winemac.drv/cocoa_window.m
dlls/winemac.drv/macdrv_cocoa.h
+2
-0
2 additions, 0 deletions
dlls/winemac.drv/macdrv_cocoa.h
dlls/winemac.drv/window.c
+3
-0
3 additions, 0 deletions
dlls/winemac.drv/window.c
with
17 additions
and
0 deletions
dlls/winemac.drv/cocoa_window.m
+
12
−
0
View file @
15d4b2ab
...
@@ -156,6 +156,7 @@ - (void) setWindowFeatures:(const struct macdrv_window_features*)wf
...
@@ -156,6 +156,7 @@ - (void) setWindowFeatures:(const struct macdrv_window_features*)wf
-
(
void
)
setMacDrvState
:(
const
struct
macdrv_window_state
*
)
state
-
(
void
)
setMacDrvState
:(
const
struct
macdrv_window_state
*
)
state
{
{
NSInteger
level
;
NSInteger
level
;
NSWindowCollectionBehavior
behavior
;
self
.
disabled
=
state
->
disabled
;
self
.
disabled
=
state
->
disabled
;
self
.
noActivate
=
state
->
no_activate
;
self
.
noActivate
=
state
->
no_activate
;
...
@@ -164,6 +165,17 @@ - (void) setMacDrvState:(const struct macdrv_window_state*)state
...
@@ -164,6 +165,17 @@ - (void) setMacDrvState:(const struct macdrv_window_state*)state
level
=
state
->
floating
?
NSFloatingWindowLevel
:
NSNormalWindowLevel
;
level
=
state
->
floating
?
NSFloatingWindowLevel
:
NSNormalWindowLevel
;
if
(
level
!=
[
self
level
])
if
(
level
!=
[
self
level
])
[
self
setLevel
:
level
];
[
self
setLevel
:
level
];
behavior
=
NSWindowCollectionBehaviorDefault
;
if
(
state
->
excluded_by_expose
)
behavior
|=
NSWindowCollectionBehaviorTransient
;
else
behavior
|=
NSWindowCollectionBehaviorManaged
;
if
(
state
->
excluded_by_cycle
)
behavior
|=
NSWindowCollectionBehaviorIgnoresCycle
;
else
behavior
|=
NSWindowCollectionBehaviorParticipatesInCycle
;
[
self
setCollectionBehavior
:
behavior
];
}
}
/* Returns whether or not the window was ordered in, which depends on if
/* Returns whether or not the window was ordered in, which depends on if
...
...
This diff is collapsed.
Click to expand it.
dlls/winemac.drv/macdrv_cocoa.h
+
2
−
0
View file @
15d4b2ab
...
@@ -129,6 +129,8 @@
...
@@ -129,6 +129,8 @@
unsigned
int
disabled
:
1
;
unsigned
int
disabled
:
1
;
unsigned
int
no_activate
:
1
;
unsigned
int
no_activate
:
1
;
unsigned
int
floating
:
1
;
unsigned
int
floating
:
1
;
unsigned
int
excluded_by_expose
:
1
;
unsigned
int
excluded_by_cycle
:
1
;
};
};
extern
macdrv_window
macdrv_create_cocoa_window
(
const
struct
macdrv_window_features
*
wf
,
extern
macdrv_window
macdrv_create_cocoa_window
(
const
struct
macdrv_window_features
*
wf
,
...
...
This diff is collapsed.
Click to expand it.
dlls/winemac.drv/window.c
+
3
−
0
View file @
15d4b2ab
...
@@ -104,6 +104,9 @@ static void get_cocoa_window_state(struct macdrv_win_data *data,
...
@@ -104,6 +104,9 @@ static void get_cocoa_window_state(struct macdrv_win_data *data,
state
->
disabled
=
(
style
&
WS_DISABLED
)
!=
0
;
state
->
disabled
=
(
style
&
WS_DISABLED
)
!=
0
;
state
->
no_activate
=
!
can_activate_window
(
data
->
hwnd
);
state
->
no_activate
=
!
can_activate_window
(
data
->
hwnd
);
state
->
floating
=
(
ex_style
&
WS_EX_TOPMOST
)
!=
0
;
state
->
floating
=
(
ex_style
&
WS_EX_TOPMOST
)
!=
0
;
state
->
excluded_by_expose
=
state
->
excluded_by_cycle
=
!
(
ex_style
&
WS_EX_APPWINDOW
)
&&
(
GetWindow
(
data
->
hwnd
,
GW_OWNER
)
||
(
ex_style
&
(
WS_EX_TOOLWINDOW
|
WS_EX_NOACTIVATE
)));
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment