overlay-scrollbar

Merge lp:~cimi/overlay-scrollbar/fix-window-group into lp:overlay-scrollbar

  1. fix-window-group
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Approved by: Ted Gould
Approved revision: 247
Merged at revision: 247
Proposed branch: lp:~cimi/overlay-scrollbar/fix-window-group
Merge into: lp:overlay-scrollbar
Diff against target: 38 lines (+9/-3)
1 file modified
os/os-scrollbar.c (+9/-3)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/fix-window-group
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+64055@code.launchpad.net

Description of the change

see commit message

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'os/os-scrollbar.c'
2--- os/os-scrollbar.c 2011-06-08 15:31:21 +0000
3+++ os/os-scrollbar.c 2011-06-09 17:14:29 +0000
4@@ -2224,10 +2224,10 @@
5 scrollbar = OS_SCROLLBAR (widget);
6 priv = scrollbar->priv;
7
8+ GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->realize (widget);
9+
10 gtk_window_group_add_window (priv->window_group, GTK_WINDOW (gtk_widget_get_toplevel (widget)));
11
12- GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->realize (widget);
13-
14 gdk_window_set_events (gtk_widget_get_window (widget),
15 gdk_window_get_events (gtk_widget_get_window (widget)) |
16 GDK_POINTER_MOTION_MASK);
17@@ -2365,6 +2365,7 @@
18 static void
19 os_scrollbar_unrealize (GtkWidget *widget)
20 {
21+ GList *window_group_list;
22 OsScrollbar *scrollbar;
23 OsScrollbarPrivate *priv;
24
25@@ -2381,7 +2382,12 @@
26
27 os_pager_set_parent (OS_PAGER (priv->pager), NULL);
28
29- gtk_window_group_remove_window (priv->window_group, GTK_WINDOW (gtk_widget_get_toplevel (widget)));
30+ window_group_list = gtk_window_group_list_windows (priv->window_group);
31+
32+ if (g_list_find (window_group_list, gtk_widget_get_toplevel (widget)))
33+ gtk_window_group_remove_window (priv->window_group, GTK_WINDOW (gtk_widget_get_toplevel (widget)));
34+
35+ g_list_free (window_group_list);
36
37 GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->unrealize (widget);
38 }

Subscribers

People subscribed via source and target branches