[maemo-commits] [maemo-commits] r16796 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kalikiana
Date: 2008-11-28 12:48:44 +0200 (Fri, 28 Nov 2008)
New Revision: 16796

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkprogressbar.c
Log:
2008-11-28  Christian Dywan  <christian at imendio.com>

	Fixes: NB#90883: Progressbar height change

	* gtk/gtkprogressbar.c (gtk_progress_bar_class_init),
	(gtk_progress_bar_size_request): Add minimum size style properties



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-11-28 10:17:07 UTC (rev 16795)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-11-28 10:48:44 UTC (rev 16796)
@@ -1,3 +1,10 @@
+2008-11-28  Christian Dywan  <christian at imendio.com>
+
+	Fixes: NB#90883: Progressbar height change
+
+	* gtk/gtkprogressbar.c (gtk_progress_bar_class_init),
+	(gtk_progress_bar_size_request): Add minimum size style properties
+
 2008-11-13  Christian Dywan  <christian at imendio.com>
 
 	Fixes: NB#91934: Set state for gtkentry painting

Modified: projects/haf/trunk/gtk+/gtk/gtkprogressbar.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkprogressbar.c	2008-11-28 10:17:07 UTC (rev 16795)
+++ projects/haf/trunk/gtk+/gtk/gtkprogressbar.c	2008-11-28 10:48:44 UTC (rev 16796)
@@ -52,7 +52,6 @@
 #endif /* !MAEMO_CHANGES */
 #define MIN_VERTICAL_BAR_WIDTH     22
 #define MIN_VERTICAL_BAR_HEIGHT    80
-#define MAX_TEXT_LENGTH            80
 
 enum {
   PROP_0,
@@ -229,10 +228,63 @@
                                                              G_PARAM_READWRITE));
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("yspacing",
-                                                             "YSpacing",
-                                                             "Extra spacing applied to the height of a progress bar.",
+                                                             P_("YSpacing"),
+                                                             P_("Extra spacing applied to the height of a progress bar."),
                                                              0, G_MAXINT, 7,
                                                              G_PARAM_READWRITE));
+
+  /**
+   * GtkProgressBar:min-horizontal-bar-width:
+   *
+   * The minimum horizontal width of the progress bar.
+   *
+   * Since: 2.14
+   */
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("min-horizontal-bar-width",
+                                                             P_("Min horizontal bar width"),
+                                                             P_("The minimum horizontal width of the progress bar"),
+                                                             1, G_MAXINT, MIN_HORIZONTAL_BAR_WIDTH,
+                                                             G_PARAM_READWRITE));
+  /**
+   * GtkProgressBar:min-horizontal-bar-height:
+   *
+   * Minimum horizontal height of the progress bar.
+   *
+   * Since: 2.14
+   */
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("min-horizontal-bar-height",
+                                                             P_("Min horizontal bar height"),
+                                                             P_("Minimum horizontal height of the progress bar"),
+                                                             1, G_MAXINT, MIN_HORIZONTAL_BAR_HEIGHT,
+                                                             G_PARAM_READWRITE));
+  /**
+   * GtkProgressBar:min-vertical-bar-width:
+   *
+   * The minimum vertical width of the progress bar.
+   *
+   * Since: 2.14
+   */
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("min-vertical-bar-width",
+                                                             P_("Min vertical bar width"),
+                                                             P_("The minimum vertical width of the progress bar"),
+                                                             1, G_MAXINT, MIN_VERTICAL_BAR_WIDTH,
+                                                             G_PARAM_READWRITE));
+  /**
+   * GtkProgressBar:min-vertical-bar-height:
+   *
+   * The minimum vertical height of the progress bar.
+   *
+   * Since: 2.14
+   */
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("min-vertical-bar-height",
+                                                             P_("Min vertical bar height"),
+                                                             P_("The minimum vertical height of the progress bar"),
+                                                             1, G_MAXINT, MIN_VERTICAL_BAR_HEIGHT,
+                                                             G_PARAM_READWRITE));
 }
 
 static void
@@ -505,6 +557,7 @@
   PangoLayout *layout;
   gint width, height;
   gint xspacing, yspacing;
+  gint min_width, min_height;
 
   g_return_if_fail (GTK_IS_PROGRESS_BAR (widget));
   g_return_if_fail (requisition != NULL);
@@ -557,15 +610,18 @@
   
   if (pbar->orientation == GTK_PROGRESS_LEFT_TO_RIGHT ||
       pbar->orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
-    {
-      requisition->width = MAX (MIN_HORIZONTAL_BAR_WIDTH, width);
-      requisition->height = MAX (MIN_HORIZONTAL_BAR_HEIGHT, height);
-    }
+    gtk_widget_style_get (widget,
+			  "min-horizontal-bar-width", &min_width,
+			  "min-horizontal-bar-height", &min_height,
+			  NULL);
   else
-    {
-      requisition->width = MAX (MIN_VERTICAL_BAR_WIDTH, width);
-      requisition->height = MAX (MIN_VERTICAL_BAR_HEIGHT, height);
-    }
+    gtk_widget_style_get (widget,
+			  "min-vertical-bar-width", &min_width,
+			  "min-vertical-bar-height", &min_height,
+			  NULL);
+
+  requisition->width = MAX (min_width, width);
+  requisition->height = MAX (min_height, height);
 }
 
 static void