Merge lp:~cimi/overlay-scrollbar/fix-771511 into lp:overlay-scrollbar

Proposed by Andrea Cimitan
Status: Merged
Merged at revision: 227
Proposed branch: lp:~cimi/overlay-scrollbar/fix-771511
Merge into: lp:overlay-scrollbar
Diff against target: 37 lines (+2/-5)
2 files modified
os/os-scrollbar.c (+2/-2)
os/os-utils.c (+0/-3)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/fix-771511
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+59140@code.launchpad.net

Description of the change

the scrollbar's gdkwindow is not always the same of the toplevel, so the check for the active window may fail... let's get the toplevel, and check for the active window from it.

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

+1 looks good and makes good sense

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-04-26 15:20:49 +0000
3+++ os/os-scrollbar.c 2011-04-26 22:20:55 +0000
4@@ -1197,7 +1197,7 @@
5
6 if (gtk_widget_get_mapped (GTK_WIDGET (scrollbar)))
7 {
8- if (gtk_widget_get_window (GTK_WIDGET (scrollbar)) ==
9+ if (gtk_widget_get_window (gtk_widget_get_toplevel (GTK_WIDGET (scrollbar))) ==
10 gdk_screen_get_active_window (gtk_widget_get_screen (GTK_WIDGET (scrollbar))))
11 {
12 /* stops potential running timeout. */
13@@ -1666,7 +1666,7 @@
14 priv->proximity = TRUE;
15
16 /* on map, check for the active window. */
17- if (gtk_widget_get_window (widget) ==
18+ if (gtk_widget_get_window (gtk_widget_get_toplevel (widget)) ==
19 gdk_screen_get_active_window (gtk_widget_get_screen (widget)))
20 {
21 /* stops potential running timeout. */
22
23=== modified file 'os/os-utils.c'
24--- os/os-utils.c 2011-04-26 22:09:39 +0000
25+++ os/os-utils.c 2011-04-26 22:20:55 +0000
26@@ -37,11 +37,8 @@
27 "Banshee",
28 "codeblocks",
29 "codelite",
30- "deja-dup",
31 "eclipse",
32 "gnucash",
33- "inkscape",
34- "lshw-gtk",
35 "meld",
36 "pgadmin3",
37 "synaptic",

Subscribers

People subscribed via source and target branches