diff options
| author | Elijah Newren <newren@gmail.com> | 2004-12-22 23:52:52 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2004-12-22 23:52:52 +0000 |
| commit | f4f8699d84999efac681e26f83403dbd0a45ea9a (patch) | |
| tree | 54f81fc29a8e101840349839bbf2c53749022146 /src/display.c | |
| parent | 85d4c396d0c86087349998ca3b586a3792448dfc (diff) | |
| download | metacity-f4f8699d84999efac681e26f83403dbd0a45ea9a.tar.gz | |
Partially resolve the conflicting requirements of windows on multiple
2004-12-22 Elijah Newren <newren@gmail.com>
Partially resolve the conflicting requirements of windows on
multiple workspaces and hidden being a global quantity for windows
(fixes bug 156182; the remainder of the work is bug 87531 and is a
libwnck issue)
* src/display.c (event_callback):
* src/window.c (meta_window_visible_on_workspace, meta_window_unstick):
* src/workspace.c (meta_workspace_add_window,
meta_workspace_contains_window,
meta_workspace_queue_calc_showing):
* src/workspace.h:
Remove meta_workspace_contains_window, replace with simple
comparison utilizing window->workspace
* src/place.c (meta_window_place):
* src/window.c (meta_window_shares_some_workspace):
* src/window.h:
Remove meta_window_shares_some_workspace, replace with a simple
comparison utilizing window->workspace
* src/session.c (save_state),
* src/window.c (meta_window_new_with_attrs,
meta_window_apply_session_info, meta_window_free,
window_showing_on_its_workspace,
meta_window_change_workspace_without_transients,
meta_window_unstick, meta_window_set_current_workspace_hint,
meta_window_get_workspaces):
* src/window.h:
* src/workspace.c (meta_workspace_free, meta_workspace_add_window,
meta_workspace_remove_window):
Only one workspace now
Diffstat (limited to 'src/display.c')
| -rw-r--r-- | src/display.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/display.c b/src/display.c index 65692a4d..e4c57675 100644 --- a/src/display.c +++ b/src/display.c @@ -1947,8 +1947,7 @@ event_callback (XEvent *event, if (window->minimized) { meta_window_unminimize (window); - if (!meta_workspace_contains_window (window->screen->active_workspace, - window)) + if (window->workspace != window->screen->active_workspace) { meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n", window->mapped, window->minimized); |