AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove size_request from GtkProgressBar

Browse Source
This commit is contained in:
Matthias Clasen 2010-10-26 23:30:48 -04:00
parent 4ca87168d4
commit e45e9b187b
1 changed files with 82 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
gtk/gtkprogressbar.c
View File

@ -74,23 +74,28 @@ enum {
PROP_ELLIPSIZE PROP_ELLIPSIZE
}; };
static void gtk_progress_bar_set_property (GObject *object, static void gtk_progress_bar_set_property (GObject *object,
guint prop_id, guint prop_id,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gtk_progress_bar_get_property (GObject *object, static void gtk_progress_bar_get_property (GObject *object,
guint prop_id, guint prop_id,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gtk_progress_bar_size_request (GtkWidget *widget, static void gtk_progress_bar_get_preferred_width (GtkWidget *widget,
GtkRequisition *requisition); gint *minimum,
static void gtk_progress_bar_real_update (GtkProgressBar *progress); gint *natural);
static gboolean gtk_progress_bar_draw (GtkWidget *widget, static void gtk_progress_bar_get_preferred_height (GtkWidget *widget,
cairo_t *cr); gint *minimum,
static void gtk_progress_bar_act_mode_enter (GtkProgressBar *progress); gint *natural);
static void gtk_progress_bar_finalize (GObject *object);
static void gtk_progress_bar_set_orientation (GtkProgressBar *progress, static void gtk_progress_bar_real_update (GtkProgressBar *progress);
GtkOrientation orientation); static gboolean gtk_progress_bar_draw (GtkWidget *widget,
cairo_t *cr);
static void gtk_progress_bar_act_mode_enter (GtkProgressBar *progress);
static void gtk_progress_bar_finalize (GObject *object);
static void gtk_progress_bar_set_orientation (GtkProgressBar *progress,
GtkOrientation orientation);
G_DEFINE_TYPE_WITH_CODE (GtkProgressBar, gtk_progress_bar, GTK_TYPE_WIDGET, G_DEFINE_TYPE_WITH_CODE (GtkProgressBar, gtk_progress_bar, GTK_TYPE_WIDGET,
G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL)) G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL))
@ -109,11 +114,10 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
gobject_class->finalize = gtk_progress_bar_finalize; gobject_class->finalize = gtk_progress_bar_finalize;
widget_class->draw = gtk_progress_bar_draw; widget_class->draw = gtk_progress_bar_draw;
widget_class->size_request = gtk_progress_bar_size_request; widget_class->get_preferred_width = gtk_progress_bar_get_preferred_width;
widget_class->get_preferred_height = gtk_progress_bar_get_preferred_height;
g_object_class_override_property (gobject_class, g_object_class_override_property (gobject_class, PROP_ORIENTATION, "orientation");
PROP_ORIENTATION,
"orientation");
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_INVERTED, PROP_INVERTED,
@ -462,8 +466,9 @@ get_current_text (GtkProgressBar *pbar)
} }
static void static void
gtk_progress_bar_size_request (GtkWidget *widget, gtk_progress_bar_get_preferred_width (GtkWidget *widget,
GtkRequisition *requisition) gint *minimum,
gint *natural)
{ {
GtkProgressBar *pbar; GtkProgressBar *pbar;
GtkProgressBarPrivate *priv; GtkProgressBarPrivate *priv;
@ -471,24 +476,21 @@ gtk_progress_bar_size_request (GtkWidget *widget,
gchar *buf; gchar *buf;
PangoRectangle logical_rect; PangoRectangle logical_rect;
PangoLayout *layout; PangoLayout *layout;
gint width, height; gint width;
gint xspacing, yspacing; gint xspacing;
gint min_width, min_height; gint min_width;
g_return_if_fail (GTK_IS_PROGRESS_BAR (widget)); g_return_if_fail (GTK_IS_PROGRESS_BAR (widget));
g_return_if_fail (requisition != NULL);
style = gtk_widget_get_style (widget); style = gtk_widget_get_style (widget);
gtk_widget_style_get (widget, gtk_widget_style_get (widget,
"xspacing", &xspacing, "xspacing", &xspacing,
"yspacing", &yspacing,
NULL); NULL);
pbar = GTK_PROGRESS_BAR (widget); pbar = GTK_PROGRESS_BAR (widget);
priv = pbar->priv; priv = pbar->priv;
width = 2 * style->xthickness + xspacing; width = 2 * style->xthickness + xspacing;
height = 2 * style->ythickness + yspacing;
if (priv->show_text) if (priv->show_text)
{ {
@ -515,6 +517,56 @@ gtk_progress_bar_size_request (GtkWidget *widget,
else else
width += logical_rect.width; width += logical_rect.width;
g_object_unref (layout);
g_free (buf);
}
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_widget_style_get (widget,
"min-horizontal-bar-width", &min_width,
NULL);
else
gtk_widget_style_get (widget,
"min-vertical-bar-width", &min_width,
NULL);
*minimum = *natural = MAX (min_width, width);
}
static void
gtk_progress_bar_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural)
{
GtkProgressBar *pbar;
GtkProgressBarPrivate *priv;
GtkStyle *style;
gchar *buf;
PangoRectangle logical_rect;
PangoLayout *layout;
gint height;
gint yspacing;
gint min_height;
g_return_if_fail (GTK_IS_PROGRESS_BAR (widget));
style = gtk_widget_get_style (widget);
gtk_widget_style_get (widget,
"yspacing", &yspacing,
NULL);
pbar = GTK_PROGRESS_BAR (widget);
priv = pbar->priv;
height = 2 * style->ythickness + yspacing;
if (priv->show_text)
{
buf = get_current_text (pbar);
layout = gtk_widget_create_pango_layout (widget, buf);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
height += logical_rect.height; height += logical_rect.height;
g_object_unref (layout); g_object_unref (layout);
@ -523,17 +575,14 @@ gtk_progress_bar_size_request (GtkWidget *widget,
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_widget_style_get (widget, gtk_widget_style_get (widget,
"min-horizontal-bar-width", &min_width,
"min-horizontal-bar-height", &min_height, "min-horizontal-bar-height", &min_height,
NULL); NULL);
else else
gtk_widget_style_get (widget, gtk_widget_style_get (widget,
"min-vertical-bar-width", &min_width,
"min-vertical-bar-height", &min_height, "min-vertical-bar-height", &min_height,
NULL); NULL);
requisition->width = MAX (min_width, width); *minimum = *natural = MAX (min_height, height);
requisition->height = MAX (min_height, height);
} }
static void static void