[gnome-control-center] wacom: Have a label even when we have 1 page
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] wacom: Have a label even when we have 1 page
- Date: Mon, 30 Jan 2012 16:12:31 +0000 (UTC)
commit 485dc70e282c5e71c7dfeec421fdfa545526f7e9
Author: Bastien Nocera <hadess hadess net>
Date: Mon Jan 30 16:08:44 2012 +0000
wacom: Have a label even when we have 1 page
To make the layout work even when hidden.
panels/wacom/cc-wacom-nav-button.c | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-nav-button.c b/panels/wacom/cc-wacom-nav-button.c
index 6b7d876..fa0a000 100644
--- a/panels/wacom/cc-wacom-nav-button.c
+++ b/panels/wacom/cc-wacom-nav-button.c
@@ -54,6 +54,8 @@ cc_wacom_nav_button_update (CcWacomNavButton *nav)
{
CcWacomNavButtonPrivate *priv = nav->priv;
int num_pages;
+ int current_page;
+ char *text;
if (priv->notebook == NULL) {
gtk_widget_hide (GTK_WIDGET (nav));
@@ -71,26 +73,23 @@ cc_wacom_nav_button_update (CcWacomNavButton *nav)
g_assert (num_pages >= 1);
- if (num_pages == 1) {
+ if (num_pages == 1)
gtk_widget_hide (GTK_WIDGET (nav));
- } else {
- int current_page;
- char *text;
-
+ else
gtk_widget_show (GTK_WIDGET (nav));
- current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
- if (current_page < 0)
- return;
- if (priv->ignore_first_page)
- current_page--;
- gtk_widget_set_sensitive (priv->prev, current_page == 0 ? FALSE : TRUE);
- gtk_widget_set_sensitive (priv->next, current_page + 1 == num_pages ? FALSE : TRUE);
-
- text = g_strdup_printf (_("%d of %d"),
- current_page + 1,
- num_pages);
- gtk_label_set_text (GTK_LABEL (priv->label), text);
- }
+
+ current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
+ if (current_page < 0)
+ return;
+ if (priv->ignore_first_page)
+ current_page--;
+ gtk_widget_set_sensitive (priv->prev, current_page == 0 ? FALSE : TRUE);
+ gtk_widget_set_sensitive (priv->next, current_page + 1 == num_pages ? FALSE : TRUE);
+
+ text = g_strdup_printf (_("%d of %d"),
+ current_page + 1,
+ num_pages);
+ gtk_label_set_text (GTK_LABEL (priv->label), text);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]