Merge lp:~cimi/overlay-scrollbar/hide-thumb-more-often into lp:overlay-scrollbar

Proposed by Andrea Cimitan
Status: Merged
Merged at revision: 180
Proposed branch: lp:~cimi/overlay-scrollbar/hide-thumb-more-often
Merge into: lp:overlay-scrollbar
Diff against target: 39 lines (+15/-1)
1 file modified
os/os-scrollbar.c (+15/-1)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/hide-thumb-more-often
Reviewer Review Type Date Requested Status
Loïc Molinari (community) Approve
Review via email: mp+55255@code.launchpad.net

Description of the change

Just figure out when gtk_widget_hide (priv->thumb) is safe to be called.

To post a comment you must log in.
179. By Andrea Cimitan

comment modified

180. By Andrea Cimitan

removed some checks, they should be useless since the priv->thumb should be available to the whole lifecycle of the scrollbar object, till finalize

Revision history for this message
Loïc Molinari (loic.molinari) :
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-03-28 17:42:42 +0000
3+++ os/os-scrollbar.c 2011-03-29 10:26:49 +0000
4@@ -984,7 +984,11 @@
5 {
6 priv->fullsize = TRUE;
7 if (priv->proximity != FALSE)
8- os_pager_hide (OS_PAGER (priv->pager));
9+ {
10+ os_pager_hide (OS_PAGER (priv->pager));
11+
12+ gtk_widget_hide (priv->thumb);
13+ }
14 }
15
16 os_scrollbar_calc_layout_pager (scrollbar, adjustment->value);
17@@ -1503,6 +1507,8 @@
18
19 os_pager_hide (OS_PAGER (priv->pager));
20
21+ gtk_widget_hide (priv->thumb);
22+
23 if (gtk_widget_get_realized (priv->parent) && priv->filter == TRUE)
24 {
25 priv->filter = FALSE;
26@@ -1513,6 +1519,14 @@
27 static void
28 os_scrollbar_unrealize (GtkWidget *widget)
29 {
30+ OsScrollbar *scrollbar;
31+ OsScrollbarPrivate *priv;
32+
33+ scrollbar = OS_SCROLLBAR (widget);
34+ priv = scrollbar->priv;
35+
36+ gtk_widget_hide (priv->thumb);
37+
38 GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->unrealize (widget);
39 }
40

Subscribers

People subscribed via source and target branches