brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use meta_window_located_on_workspace() in more places

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=691744
This commit is contained in:
Jasper St. Pierre 2013-01-18 14:55:23 -05:00
parent d8eb47e2b7
commit df15843407
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/place.c
View File

@ -847,10 +847,9 @@ meta_window_place (MetaWindow *window,
{ {
MetaWindow *w = tmp->data; MetaWindow *w = tmp->data;
if (meta_window_showing_on_its_workspace (w) && if (w != window &&
w != window && meta_window_showing_on_its_workspace (w) &&
(window->workspace == w->workspace || meta_window_located_on_workspace (w, window->workspace))
window->on_all_workspaces || w->on_all_workspaces))
windows = g_list_prepend (windows, w); windows = g_list_prepend (windows, w);
tmp = tmp->next; tmp = tmp->next;

4
src/core/window.c
View File

@ -10129,9 +10129,7 @@ meta_window_set_demands_attention (MetaWindow *window)
other_window = stack->data; other_window = stack->data;
stack = stack->next; stack = stack->next;
if (other_window->on_all_workspaces || if (meta_window_located_on_workspace (other_window, window->workspace))
window->on_all_workspaces ||
other_window->workspace == window->workspace)
{ {
meta_window_get_outer_rect (other_window, &other_rect); meta_window_get_outer_rect (other_window, &other_rect);

3
src/core/workspace.c
View File

@ -1292,8 +1292,7 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
ancestor = NULL; ancestor = NULL;
meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor); meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor);
if (ancestor != NULL && if (ancestor != NULL &&
(ancestor->on_all_workspaces || meta_window_located_on_workspace (ancestor, workspace) &&
ancestor->workspace == workspace) &&
meta_window_showing_on_its_workspace (ancestor)) meta_window_showing_on_its_workspace (ancestor))
{ {
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,