callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk: Finish conversion to in-struct GdkWindow list nodes

Browse Source
This commit is contained in:
Alexander Larsson
2015-09-21 15:33:53 +02:00
parent d29c48815c
commit 9bda0532f8
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/gdkoffscreenwindow.c
View File

@ -195,7 +195,7 @@ gdk_offscreen_window_reparent (GdkWindow *window,
gdk_window_hide (window); gdk_window_hide (window);
if (window->parent) if (window->parent)
window->parent->children = g_list_remove (window->parent->children, window); window->parent->children = g_list_remove_link (window->parent->children, &window->children_list_node);
old_parent = window->parent; old_parent = window->parent;
window->parent = new_parent; window->parent = new_parent;
@ -203,7 +203,7 @@ gdk_offscreen_window_reparent (GdkWindow *window,
window->y = y; window->y = y;
if (new_parent) if (new_parent)
window->parent->children = g_list_prepend (window->parent->children, window); window->parent->children = g_list_concat (&window->children_list_node, window->parent->children);
_gdk_synthesize_crossing_events_for_geometry_change (window); _gdk_synthesize_crossing_events_for_geometry_change (window);
if (old_parent) if (old_parent)

7
gdk/win32/gdkwindow-win32.c
View File

@ -760,7 +760,7 @@ gdk_win32_window_foreign_new_for_display (GdkDisplay *display,
if (!window->parent || GDK_WINDOW_TYPE (window->parent) == GDK_WINDOW_FOREIGN) if (!window->parent || GDK_WINDOW_TYPE (window->parent) == GDK_WINDOW_FOREIGN)
window->parent = _gdk_root; window->parent = _gdk_root;
window->parent->children = g_list_prepend (window->parent->children, window); window->parent->children = g_list_concat (&window->children_list_node, window->parent->children);
window->parent->impl_window->native_children = window->parent->impl_window->native_children =
g_list_prepend (window->parent->impl_window->native_children, window); g_list_prepend (window->parent->impl_window->native_children, window);
@ -1504,10 +1504,9 @@ gdk_win32_window_reparent (GdkWindow *window,
} }
if (old_parent) if (old_parent)
old_parent->children = old_parent->children = g_list_remove_link (old_parent->children, &window->children_list_node);
g_list_remove (old_parent->children, window);
parent->children = g_list_prepend (parent->children, window); parent->children = g_list_concat (&window->children_list_node, parent->children);
return FALSE; return FALSE;
} }

2
gdk/x11/gdkwindow-x11.c
View File

@ -1239,7 +1239,7 @@ gdk_x11_window_foreign_new_for_display (GdkDisplay *display,
if (!win->parent || GDK_WINDOW_TYPE (win->parent) == GDK_WINDOW_FOREIGN) if (!win->parent || GDK_WINDOW_TYPE (win->parent) == GDK_WINDOW_FOREIGN)
win->parent = gdk_screen_get_root_window (screen); win->parent = gdk_screen_get_root_window (screen);
win->parent->children = g_list_prepend (win->parent->children, win); win->parent->children = g_list_concat (&win->children_list_node, win->parent->children);
win->parent->impl_window->native_children = win->parent->impl_window->native_children =
g_list_prepend (win->parent->impl_window->native_children, win); g_list_prepend (win->parent->impl_window->native_children, win);