callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 429411 – add style properties to set minimum progressbar

Browse Source 
2008-08-02  Matthias Clasen  <mclasen@redhat.com>

        Bug 429411 – add style properties to set minimum progressbar
        width/height

        * gtk/gtkprogressbar.c: Add style properties for minimum size.
        Patch by Carlos Garnacho and Christian Dywan


svn path=/trunk/; revision=20938
This commit is contained in:
Matthias Clasen
2008-08-02 04:48:47 +00:00
committed by Matthias Clasen
parent 4080d5c3af
commit 7d88f59fad
2 changed files with 75 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-08-02 Matthias Clasen <mclasen@redhat.com>
Bug 429411 – add style properties to set minimum progressbar
width/height
* gtk/gtkprogressbar.c: Add style properties for minimum size.
Patch by Carlos Garnacho and Christian Dywan
2008-08-02 Matthias Clasen <mclasen@redhat.com> 2008-08-02 Matthias Clasen <mclasen@redhat.com>
Bug 526575 – Missing return type in gtk_ui_manager_get_toplevels Bug 526575 – Missing return type in gtk_ui_manager_get_toplevels

78
gtk/gtkprogressbar.c
View File

@ -38,7 +38,6 @@
#define MIN_HORIZONTAL_BAR_HEIGHT 20 #define MIN_HORIZONTAL_BAR_HEIGHT 20
#define MIN_VERTICAL_BAR_WIDTH 22 #define MIN_VERTICAL_BAR_WIDTH 22
#define MIN_VERTICAL_BAR_HEIGHT 80 #define MIN_VERTICAL_BAR_HEIGHT 80
#define MAX_TEXT_LENGTH 80
enum { enum {
PROP_0, PROP_0,
@ -215,10 +214,63 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
G_PARAM_READWRITE)); G_PARAM_READWRITE));
gtk_widget_class_install_style_property (widget_class, gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("yspacing", g_param_spec_int ("yspacing",
"YSpacing", P_("YSpacing"),
"Extra spacing applied to the height of a progress bar.", P_("Extra spacing applied to the height of a progress bar."),
0, G_MAXINT, 7, 0, G_MAXINT, 7,
G_PARAM_READWRITE)); 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 static void
@ -485,6 +537,7 @@ gtk_progress_bar_size_request (GtkWidget *widget,
PangoLayout *layout; PangoLayout *layout;
gint width, height; gint width, height;
gint xspacing, yspacing; gint xspacing, yspacing;
gint min_width, min_height;
g_return_if_fail (GTK_IS_PROGRESS_BAR (widget)); g_return_if_fail (GTK_IS_PROGRESS_BAR (widget));
g_return_if_fail (requisition != NULL); g_return_if_fail (requisition != NULL);
@ -537,15 +590,18 @@ gtk_progress_bar_size_request (GtkWidget *widget,
if (pbar->orientation == GTK_PROGRESS_LEFT_TO_RIGHT || if (pbar->orientation == GTK_PROGRESS_LEFT_TO_RIGHT ||
pbar->orientation == GTK_PROGRESS_RIGHT_TO_LEFT) pbar->orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
{ gtk_widget_style_get (widget,
requisition->width = MAX (MIN_HORIZONTAL_BAR_WIDTH, width); "min-horizontal-bar-width", &min_width,
requisition->height = MAX (MIN_HORIZONTAL_BAR_HEIGHT, height); "min-horizontal-bar-height", &min_height,
} NULL);
else else
{ gtk_widget_style_get (widget,
requisition->width = MAX (MIN_VERTICAL_BAR_WIDTH, width); "min-vertical-bar-width", &min_width,
requisition->height = MAX (MIN_VERTICAL_BAR_HEIGHT, height); "min-vertical-bar-height", &min_height,
} NULL);
requisition->width = MAX (min_width, width);
requisition->height = MAX (min_height, height);
} }
static void static void