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
=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c 2011-03-28 17:42:42 +0000
+++ os/os-scrollbar.c 2011-03-29 10:26:49 +0000
@@ -984,7 +984,11 @@
984 {984 {
985 priv->fullsize = TRUE;985 priv->fullsize = TRUE;
986 if (priv->proximity != FALSE)986 if (priv->proximity != FALSE)
987 os_pager_hide (OS_PAGER (priv->pager));987 {
988 os_pager_hide (OS_PAGER (priv->pager));
989
990 gtk_widget_hide (priv->thumb);
991 }
988 }992 }
989993
990 os_scrollbar_calc_layout_pager (scrollbar, adjustment->value);994 os_scrollbar_calc_layout_pager (scrollbar, adjustment->value);
@@ -1503,6 +1507,8 @@
15031507
1504 os_pager_hide (OS_PAGER (priv->pager));1508 os_pager_hide (OS_PAGER (priv->pager));
15051509
1510 gtk_widget_hide (priv->thumb);
1511
1506 if (gtk_widget_get_realized (priv->parent) && priv->filter == TRUE)1512 if (gtk_widget_get_realized (priv->parent) && priv->filter == TRUE)
1507 {1513 {
1508 priv->filter = FALSE;1514 priv->filter = FALSE;
@@ -1513,6 +1519,14 @@
1513static void1519static void
1514os_scrollbar_unrealize (GtkWidget *widget)1520os_scrollbar_unrealize (GtkWidget *widget)
1515{1521{
1522 OsScrollbar *scrollbar;
1523 OsScrollbarPrivate *priv;
1524
1525 scrollbar = OS_SCROLLBAR (widget);
1526 priv = scrollbar->priv;
1527
1528 gtk_widget_hide (priv->thumb);
1529
1516 GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->unrealize (widget);1530 GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->unrealize (widget);
1517}1531}
15181532

Subscribers

People subscribed via source and target branches