[gtk+] Get rid of GtkProgress
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Get rid of GtkProgress
- Date: Wed, 9 Jun 2010 04:37:32 +0000 (UTC)
commit 5e0dfed135c715346e6bf40df3eab501771ab9fd
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jun 9 00:29:55 2010 -0400
Get rid of GtkProgress
The entire api was deprecated since 2.0. This patch detangles
GtkProgress from GtkProgressBar and moves all the pieces into
GtkProgressBar that are required for non-deprecated progressbar
functionality.
Bug #620618
docs/reference/gtk/gtk3-sections.txt | 45 +--
docs/reference/gtk/gtk3.types | 1 -
gtk/Makefile.am | 6 -
gtk/gtk.symbols | 23 +-
gtk/gtkprogress.c | 713 -------------------------
gtk/gtkprogress.h | 120 -----
gtk/gtkprogressbar.c | 967 +++++++++++++++++++---------------
gtk/gtkprogressbar.h | 34 +-
modules/other/gail/gailprogressbar.c | 116 +----
modules/other/gail/gailprogressbar.h | 2 -
tests/testgtk.c | 7 +-
11 files changed, 576 insertions(+), 1458 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index c7ef3c2..628af78 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -2345,51 +2345,24 @@ gtk_plug_get_type
</SECTION>
<SECTION>
-<FILE>gtkprogress</FILE>
-<TITLE>GtkProgress</TITLE>
-GtkProgress
-gtk_progress_set_show_text
-gtk_progress_set_text_alignment
-gtk_progress_set_format_string
-gtk_progress_set_adjustment
-gtk_progress_set_percentage
-gtk_progress_set_value
-gtk_progress_get_value
-gtk_progress_set_activity_mode
-gtk_progress_get_current_text
-gtk_progress_get_text_from_value
-gtk_progress_get_current_percentage
-gtk_progress_get_percentage_from_value
-gtk_progress_configure
-<SUBSECTION Standard>
-GTK_PROGRESS
-GTK_IS_PROGRESS
-GTK_TYPE_PROGRESS
-GTK_PROGRESS_CLASS
-GTK_IS_PROGRESS_CLASS
-GTK_PROGRESS_GET_CLASS
-<SUBSECTION Private>
-gtk_progress_get_type
-</SECTION>
-
-<SECTION>
<FILE>gtkprogressbar</FILE>
<TITLE>GtkProgressBar</TITLE>
GtkProgressBar
gtk_progress_bar_new
gtk_progress_bar_pulse
-gtk_progress_bar_set_text
gtk_progress_bar_set_fraction
-gtk_progress_bar_set_pulse_step
-gtk_progress_bar_set_orientation
-gtk_progress_bar_set_ellipsize
-GtkProgressBarOrientation
-gtk_progress_bar_get_text
gtk_progress_bar_get_fraction
-gtk_progress_bar_get_pulse_step
+GtkProgressBarOrientation
+gtk_progress_bar_set_orientation
gtk_progress_bar_get_orientation
+gtk_progress_bar_set_show_text
+gtk_progress_bar_get_show_text
+gtk_progress_bar_set_text
+gtk_progress_bar_get_text
+gtk_progress_bar_set_ellipsize
gtk_progress_bar_get_ellipsize
-GtkProgressBarStyle
+gtk_progress_bar_set_pulse_step
+gtk_progress_bar_get_pulse_step
<SUBSECTION Standard>
GTK_PROGRESS_BAR
GTK_IS_PROGRESS_BAR
diff --git a/docs/reference/gtk/gtk3.types b/docs/reference/gtk/gtk3.types
index b03bb0c..b5e8e06 100644
--- a/docs/reference/gtk/gtk3.types
+++ b/docs/reference/gtk/gtk3.types
@@ -111,7 +111,6 @@ gtk_print_operation_preview_get_type
gtk_print_settings_get_type
gtk_print_unix_dialog_get_type
gtk_progress_bar_get_type
-gtk_progress_get_type
gtk_radio_action_get_type
gtk_radio_button_get_type
gtk_radio_menu_item_get_type
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e10be5f..3e791dc 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -634,12 +634,6 @@ gtk_base_c_sources = \
gtkwindow.c \
$(gtk_clipboard_dnd_c_sources)
-# Deprecated
-gtk_public_h_sources += \
- gtkprogress.h
-gtk_base_c_sources += \
- gtkprogress.c
-
gtk_c_sources = $(gtk_base_c_sources)
gtk_all_c_sources = $(gtk_base_c_sources)
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 6439b90..ae7bf42 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -365,7 +365,6 @@ gtk_recent_filter_flags_get_type G_GNUC_CONST
gtk_print_operation_action_get_type G_GNUC_CONST
gtk_private_flags_get_type G_GNUC_CONST
gtk_progress_bar_orientation_get_type G_GNUC_CONST
-gtk_progress_bar_style_get_type G_GNUC_CONST
gtk_rc_flags_get_type G_GNUC_CONST
gtk_rc_token_type_get_type G_GNUC_CONST
gtk_recent_chooser_error_get_type G_GNUC_CONST
@@ -2676,26 +2675,6 @@ gtk_print_win32_devnames_from_printer_name
#endif
#endif
-#if IN_HEADER(__GTK_PROGRESS_H__)
-#if IN_FILE(__GTK_PROGRESS_C__)
-#ifndef GTK_DISABLE_DEPRECATED
-gtk_progress_configure
-gtk_progress_get_current_percentage
-gtk_progress_get_current_text
-gtk_progress_get_percentage_from_value
-gtk_progress_get_text_from_value
-gtk_progress_get_type
-gtk_progress_get_value
-gtk_progress_set_activity_mode
-gtk_progress_set_adjustment
-gtk_progress_set_format_string
-gtk_progress_set_percentage
-gtk_progress_set_show_text
-gtk_progress_set_text_alignment
-gtk_progress_set_value
-#endif
-#endif
-#endif
#if IN_HEADER(__GTK_PROGRESS_BAR_H__)
#if IN_FILE(__GTK_PROGRESS_BAR_C__)
@@ -2712,6 +2691,8 @@ gtk_progress_bar_set_orientation
gtk_progress_bar_set_pulse_step
gtk_progress_bar_set_text
gtk_progress_bar_set_ellipsize
+gtk_progress_bar_set_show_text
+gtk_progress_bar_get_show_text
#endif
#endif
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 0274f62..77acc7f 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "config.h"
@@ -44,33 +44,36 @@
enum {
PROP_0,
-
- /* Supported args */
PROP_FRACTION,
PROP_PULSE_STEP,
PROP_ORIENTATION,
PROP_TEXT,
- PROP_ELLIPSIZE,
-
+ PROP_SHOW_TEXT,
+ PROP_ELLIPSIZE
};
static void gtk_progress_bar_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void gtk_progress_bar_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static gboolean gtk_progress_bar_expose (GtkWidget *widget,
- GdkEventExpose *event);
+ GdkEventExpose *event);
static void gtk_progress_bar_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
+ GtkRequisition *requisition);
+static void gtk_progress_bar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
static void gtk_progress_bar_style_set (GtkWidget *widget,
- GtkStyle *previous);
-static void gtk_progress_bar_real_update (GtkProgress *progress);
-static void gtk_progress_bar_paint (GtkProgress *progress);
-static void gtk_progress_bar_act_mode_enter (GtkProgress *progress);
+ GtkStyle *previous);
+static void gtk_progress_bar_real_update (GtkProgressBar *progress);
+static void gtk_progress_bar_paint (GtkProgressBar *progress);
+static void gtk_progress_bar_act_mode_enter (GtkProgressBar *progress);
+static void gtk_progress_bar_realize (GtkWidget *widget);
+static void gtk_progress_bar_finalize (GObject *object);
+static void gtk_progress_bar_create_pixmap (GtkProgressBar *pbar);
typedef struct
@@ -82,85 +85,94 @@ typedef struct
#define GTK_PROGRESS_BAR_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PROGRESS_BAR, GtkProgressBarPrivate))
-G_DEFINE_TYPE (GtkProgressBar, gtk_progress_bar, GTK_TYPE_PROGRESS)
+G_DEFINE_TYPE (GtkProgressBar, gtk_progress_bar, GTK_TYPE_WIDGET)
static void
gtk_progress_bar_class_init (GtkProgressBarClass *class)
{
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- GtkProgressClass *progress_class;
-
+
gobject_class = G_OBJECT_CLASS (class);
widget_class = (GtkWidgetClass *) class;
- progress_class = (GtkProgressClass *) class;
gobject_class->set_property = gtk_progress_bar_set_property;
gobject_class->get_property = gtk_progress_bar_get_property;
-
+ gobject_class->finalize = gtk_progress_bar_finalize;
+
+ widget_class->realize = gtk_progress_bar_realize;
widget_class->expose_event = gtk_progress_bar_expose;
widget_class->size_request = gtk_progress_bar_size_request;
+ widget_class->size_allocate = gtk_progress_bar_size_allocate;
widget_class->style_set = gtk_progress_bar_style_set;
- progress_class->paint = gtk_progress_bar_paint;
- progress_class->update = gtk_progress_bar_real_update;
- progress_class->act_mode_enter = gtk_progress_bar_act_mode_enter;
+ class->paint = gtk_progress_bar_paint;
+ class->update = gtk_progress_bar_real_update;
+ class->act_mode_enter = gtk_progress_bar_act_mode_enter;
g_object_class_install_property (gobject_class,
PROP_ORIENTATION,
g_param_spec_enum ("orientation",
- P_("Orientation"),
- P_("Orientation and growth direction of the progress bar"),
- GTK_TYPE_PROGRESS_BAR_ORIENTATION,
- GTK_PROGRESS_LEFT_TO_RIGHT,
- GTK_PARAM_READWRITE));
-
+ P_("Orientation"),
+ P_("Orientation and growth direction of the progress bar"),
+ GTK_TYPE_PROGRESS_BAR_ORIENTATION,
+ GTK_PROGRESS_LEFT_TO_RIGHT,
+ GTK_PARAM_READWRITE));
+
g_object_class_install_property (gobject_class,
- PROP_FRACTION,
- g_param_spec_double ("fraction",
- P_("Fraction"),
- P_("The fraction of total work that has been completed"),
- 0.0, 1.0, 0.0,
- GTK_PARAM_READWRITE));
-
+ PROP_FRACTION,
+ g_param_spec_double ("fraction",
+ P_("Fraction"),
+ P_("The fraction of total work that has been completed"),
+ 0.0, 1.0, 0.0,
+ GTK_PARAM_READWRITE));
+
g_object_class_install_property (gobject_class,
- PROP_PULSE_STEP,
- g_param_spec_double ("pulse-step",
- P_("Pulse Step"),
- P_("The fraction of total progress to move the bouncing block when pulsed"),
- 0.0, 1.0, 0.1,
- GTK_PARAM_READWRITE));
-
+ PROP_PULSE_STEP,
+ g_param_spec_double ("pulse-step",
+ P_("Pulse Step"),
+ P_("The fraction of total progress to move the bouncing block when pulsed"),
+ 0.0, 1.0, 0.1,
+ GTK_PARAM_READWRITE));
+
g_object_class_install_property (gobject_class,
- PROP_TEXT,
- g_param_spec_string ("text",
- P_("Text"),
- P_("Text to be displayed in the progress bar"),
- NULL,
- GTK_PARAM_READWRITE));
+ PROP_TEXT,
+ g_param_spec_string ("text",
+ P_("Text"),
+ P_("Text to be displayed in the progress bar"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_SHOW_TEXT,
+ g_param_spec_boolean ("show-text",
+ P_("Show text"),
+ P_("Whether the progress is shown as text."),
+ FALSE,
+ GTK_PARAM_READWRITE));
/**
* GtkProgressBar:ellipsize:
*
- * The preferred place to ellipsize the string, if the progressbar does
- * not have enough room to display the entire string, specified as a
- * #PangoEllisizeMode.
+ * The preferred place to ellipsize the string, if the progressbar does
+ * not have enough room to display the entire string, specified as a
+ * #PangoEllisizeMode.
*
- * Note that setting this property to a value other than
- * %PANGO_ELLIPSIZE_NONE has the side-effect that the progressbar requests
- * only enough space to display the ellipsis "...". Another means to set a
+ * Note that setting this property to a value other than
+ * %PANGO_ELLIPSIZE_NONE has the side-effect that the progressbar requests
+ * only enough space to display the ellipsis "...". Another means to set a
* progressbar's width is gtk_widget_set_size_request().
*
* Since: 2.6
*/
g_object_class_install_property (gobject_class,
- PROP_ELLIPSIZE,
+ PROP_ELLIPSIZE,
g_param_spec_enum ("ellipsize",
P_("Ellipsize"),
P_("The preferred place to ellipsize the string, if the progress bar "
"does not have enough room to display the entire string, if at all."),
- PANGO_TYPE_ELLIPSIZE_MODE,
- PANGO_ELLIPSIZE_NONE,
+ PANGO_TYPE_ELLIPSIZE_MODE,
+ PANGO_ELLIPSIZE_NONE,
GTK_PARAM_READWRITE));
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("xspacing",
@@ -236,7 +248,6 @@ gtk_progress_bar_init (GtkProgressBar *pbar)
{
GtkProgressBarPrivate* priv;
- pbar->bar_style = GTK_PROGRESS_CONTINUOUS;
pbar->blocks = 10;
pbar->in_block = -1;
pbar->orientation = GTK_PROGRESS_LEFT_TO_RIGHT;
@@ -246,6 +257,7 @@ gtk_progress_bar_init (GtkProgressBar *pbar)
pbar->activity_step = 3;
pbar->activity_blocks = 5;
pbar->ellipsize = PANGO_ELLIPSIZE_NONE;
+ pbar->show_text = FALSE;
/* FIXME: Put priv in the structure once we break ABI */
priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar);
@@ -254,10 +266,40 @@ gtk_progress_bar_init (GtkProgressBar *pbar)
}
static void
+gtk_progress_bar_realize (GtkWidget *widget)
+{
+ GdkWindowAttr attributes;
+ gint attributes_mask;
+
+ gtk_widget_set_realized (widget, TRUE);
+
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.x = widget->allocation.x;
+ attributes.y = widget->allocation.y;
+ attributes.width = widget->allocation.width;
+ attributes.height = widget->allocation.height;
+ attributes.wclass = GDK_INPUT_OUTPUT;
+ attributes.visual = gtk_widget_get_visual (widget);
+ attributes.colormap = gtk_widget_get_colormap (widget);
+ attributes.event_mask = gtk_widget_get_events (widget);
+ attributes.event_mask |= GDK_EXPOSURE_MASK;
+
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+ widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (widget->window, widget);
+
+ widget->style = gtk_style_attach (widget->style, widget->window);
+ gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);
+
+ gtk_progress_bar_create_pixmap (GTK_PROGRESS_BAR (widget));
+}
+
+static void
gtk_progress_bar_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GtkProgressBar *pbar;
@@ -277,6 +319,9 @@ gtk_progress_bar_set_property (GObject *object,
case PROP_TEXT:
gtk_progress_bar_set_text (pbar, g_value_get_string (value));
break;
+ case PROP_SHOW_TEXT:
+ gtk_progress_bar_set_show_text (pbar, g_value_get_boolean (value));
+ break;
case PROP_ELLIPSIZE:
gtk_progress_bar_set_ellipsize (pbar, g_value_get_enum (value));
break;
@@ -288,9 +333,9 @@ gtk_progress_bar_set_property (GObject *object,
static void
gtk_progress_bar_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
GtkProgressBar *pbar;
GtkProgressBarPrivate* priv;
@@ -312,6 +357,9 @@ gtk_progress_bar_get_property (GObject *object,
case PROP_TEXT:
g_value_set_string (value, priv->text);
break;
+ case PROP_SHOW_TEXT:
+ g_value_set_boolean (value, pbar->show_text);
+ break;
case PROP_ELLIPSIZE:
g_value_set_enum (value, pbar->ellipsize);
break;
@@ -332,125 +380,132 @@ gtk_progress_bar_new (void)
}
static void
-gtk_progress_bar_real_update (GtkProgress *progress)
+gtk_progress_bar_real_update (GtkProgressBar *pbar)
{
- GtkProgressBar *pbar;
GtkWidget *widget;
- g_return_if_fail (GTK_IS_PROGRESS (progress));
+ g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
- pbar = GTK_PROGRESS_BAR (progress);
- widget = GTK_WIDGET (progress);
-
- if (pbar->bar_style == GTK_PROGRESS_CONTINUOUS ||
- GTK_PROGRESS (pbar)->activity_mode)
- {
- if (GTK_PROGRESS (pbar)->activity_mode)
- {
- guint size;
-
- /* advance the block */
-
- if (pbar->orientation == GTK_PROGRESS_LEFT_TO_RIGHT ||
- pbar->orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
- {
- /* Update our activity step. */
-
- pbar->activity_step = widget->allocation.width * pbar->pulse_fraction;
-
- size = MAX (2, widget->allocation.width / pbar->activity_blocks);
-
- if (pbar->activity_dir == 0)
- {
- pbar->activity_pos += pbar->activity_step;
- if (pbar->activity_pos + size >=
- widget->allocation.width -
- widget->style->xthickness)
- {
- pbar->activity_pos = widget->allocation.width -
- widget->style->xthickness - size;
- pbar->activity_dir = 1;
- }
- }
- else
- {
- pbar->activity_pos -= pbar->activity_step;
- if (pbar->activity_pos <= widget->style->xthickness)
- {
- pbar->activity_pos = widget->style->xthickness;
- pbar->activity_dir = 0;
- }
- }
- }
- else
- {
- /* Update our activity step. */
-
- pbar->activity_step = widget->allocation.height * pbar->pulse_fraction;
-
- size = MAX (2, widget->allocation.height / pbar->activity_blocks);
-
- if (pbar->activity_dir == 0)
- {
- pbar->activity_pos += pbar->activity_step;
- if (pbar->activity_pos + size >=
- widget->allocation.height -
- widget->style->ythickness)
- {
- pbar->activity_pos = widget->allocation.height -
- widget->style->ythickness - size;
- pbar->activity_dir = 1;
- }
- }
- else
- {
- pbar->activity_pos -= pbar->activity_step;
- if (pbar->activity_pos <= widget->style->ythickness)
- {
- pbar->activity_pos = widget->style->ythickness;
- pbar->activity_dir = 0;
- }
- }
- }
- }
- pbar->dirty = TRUE;
- gtk_widget_queue_draw (GTK_WIDGET (progress));
- }
- else
+ widget = GTK_WIDGET (pbar);
+
+ if (pbar->activity_mode)
{
- gint in_block;
-
- in_block = -1 + (gint)(gtk_progress_get_current_percentage (progress) *
- (gdouble)pbar->blocks);
-
- if (pbar->in_block != in_block)
- {
- pbar->in_block = in_block;
- pbar->dirty = TRUE;
- gtk_widget_queue_draw (GTK_WIDGET (progress));
- }
+ guint size;
+
+ /* advance the block */
+ if (pbar->orientation == GTK_PROGRESS_LEFT_TO_RIGHT ||
+ pbar->orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
+ {
+ /* Update our activity step. */
+ pbar->activity_step = widget->allocation.width * pbar->pulse_fraction;
+
+ size = MAX (2, widget->allocation.width / pbar->activity_blocks);
+
+ if (pbar->activity_dir == 0)
+ {
+ pbar->activity_pos += pbar->activity_step;
+ if (pbar->activity_pos + size >= widget->allocation.width - widget->style->xthickness)
+ {
+ pbar->activity_pos = widget->allocation.width -
+ widget->style->xthickness - size;
+ pbar->activity_dir = 1;
+ }
+ }
+ else
+ {
+ pbar->activity_pos -= pbar->activity_step;
+ if (pbar->activity_pos <= widget->style->xthickness)
+ {
+ pbar->activity_pos = widget->style->xthickness;
+ pbar->activity_dir = 0;
+ }
+ }
+ }
+ else
+ {
+ /* Update our activity step. */
+ pbar->activity_step = widget->allocation.height * pbar->pulse_fraction;
+
+ size = MAX (2, widget->allocation.height / pbar->activity_blocks);
+
+ if (pbar->activity_dir == 0)
+ {
+ pbar->activity_pos += pbar->activity_step;
+ if (pbar->activity_pos + size >= widget->allocation.height - widget->style->ythickness)
+ {
+ pbar->activity_pos = widget->allocation.height -
+ widget->style->ythickness - size;
+ pbar->activity_dir = 1;
+ }
+ }
+ else
+ {
+ pbar->activity_pos -= pbar->activity_step;
+ if (pbar->activity_pos <= widget->style->ythickness)
+ {
+ pbar->activity_pos = widget->style->ythickness;
+ pbar->activity_dir = 0;
+ }
+ }
+ }
}
+ pbar->dirty = TRUE;
+ gtk_widget_queue_draw (widget);
+}
+
+static void
+gtk_progress_bar_finalize (GObject *object)
+{
+ GtkProgressBar *pbar = GTK_PROGRESS_BAR (object);
+ GtkProgressBarPrivate *priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar);
+
+ if (pbar->offscreen_pixmap)
+ g_object_unref (pbar->offscreen_pixmap);
+
+ g_free (priv->text);
+
+ G_OBJECT_CLASS (gtk_progress_bar_parent_class)->finalize (object);
}
static gboolean
gtk_progress_bar_expose (GtkWidget *widget,
- GdkEventExpose *event)
+ GdkEventExpose *event)
{
- GtkProgressBar *pbar;
+ GtkProgressBar *pbar = GTK_PROGRESS_BAR (widget);
- g_return_val_if_fail (GTK_IS_PROGRESS_BAR (widget), FALSE);
+ if (gtk_widget_is_drawable (widget))
+ {
+ if (pbar->dirty)
+ gtk_progress_bar_paint (pbar);
+
+ gdk_draw_drawable (widget->window,
+ widget->style->black_gc,
+ pbar->offscreen_pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+ event->area.width,
+ event->area.height);
+ }
- pbar = GTK_PROGRESS_BAR (widget);
+ return FALSE;
+}
+
+static gchar *
+get_current_text (GtkProgressBar *pbar)
+{
+ GtkProgressBarPrivate *priv;
- if (pbar->dirty && gtk_widget_is_drawable (widget))
- gtk_progress_bar_paint (GTK_PROGRESS (pbar));
+ priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar);
- return GTK_WIDGET_CLASS (gtk_progress_bar_parent_class)->expose_event (widget, event);
+ if (priv->text)
+ return g_strdup (priv->text);
+ else
+ return g_strdup_printf ("%.0f %%", priv->fraction * 100.0);
}
static void
gtk_progress_bar_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+ GtkRequisition *requisition)
{
GtkProgressBar *pbar;
GtkProgressBarPrivate *priv;
@@ -475,54 +530,100 @@ gtk_progress_bar_size_request (GtkWidget *widget,
width = 2 * widget->style->xthickness + xspacing;
height = 2 * widget->style->ythickness + yspacing;
- if ((buf = priv->text))
+ if (pbar->show_text)
{
+ buf = get_current_text (pbar);
layout = gtk_widget_create_pango_layout (widget, buf);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-
+
if (pbar->ellipsize)
- {
- PangoContext *context;
- PangoFontMetrics *metrics;
- gint char_width;
-
- /* The minimum size for ellipsized text is ~ 3 chars */
- context = pango_layout_get_context (layout);
- metrics = pango_context_get_metrics (context, widget->style->font_desc, pango_context_get_language (context));
-
- char_width = pango_font_metrics_get_approximate_char_width (metrics);
- pango_font_metrics_unref (metrics);
-
- width += PANGO_PIXELS (char_width) * 3;
- }
+ {
+ PangoContext *context;
+ PangoFontMetrics *metrics;
+ gint char_width;
+
+ /* The minimum size for ellipsized text is ~ 3 chars */
+ context = pango_layout_get_context (layout);
+ metrics = pango_context_get_metrics (context, widget->style->font_desc, pango_context_get_language (context));
+
+ char_width = pango_font_metrics_get_approximate_char_width (metrics);
+ pango_font_metrics_unref (metrics);
+
+ width += PANGO_PIXELS (char_width) * 3;
+ }
else
- width += logical_rect.width;
-
+ width += logical_rect.width;
+
height += logical_rect.height;
g_object_unref (layout);
+ g_free (buf);
}
-
+
if (pbar->orientation == GTK_PROGRESS_LEFT_TO_RIGHT ||
pbar->orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
gtk_widget_style_get (widget,
- "min-horizontal-bar-width", &min_width,
- "min-horizontal-bar-height", &min_height,
- NULL);
+ "min-horizontal-bar-width", &min_width,
+ "min-horizontal-bar-height", &min_height,
+ NULL);
else
gtk_widget_style_get (widget,
- "min-vertical-bar-width", &min_width,
- "min-vertical-bar-height", &min_height,
- NULL);
+ "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
-gtk_progress_bar_style_set (GtkWidget *widget,
- GtkStyle *previous)
+gtk_progress_bar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ widget->allocation = *allocation;
+
+ if (gtk_widget_get_realized (widget))
+ {
+ gdk_window_move_resize (widget->window,
+ allocation->x, allocation->y,
+ allocation->width, allocation->height);
+
+ gtk_progress_bar_create_pixmap (GTK_PROGRESS_BAR (widget));
+ }
+}
+
+static void
+gtk_progress_bar_create_pixmap (GtkProgressBar *pbar)
+{
+ GtkWidget *widget;
+
+ widget = GTK_WIDGET (pbar);
+
+ if (gtk_widget_get_realized (widget))
+ {
+ if (pbar->offscreen_pixmap)
+ g_object_unref (pbar->offscreen_pixmap);
+
+ pbar->offscreen_pixmap = gdk_pixmap_new (widget->window,
+ widget->allocation.width,
+ widget->allocation.height,
+ -1);
+
+ /* clear the pixmap for transparent themes */
+ gtk_paint_flat_box (widget->style,
+ pbar->offscreen_pixmap,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_NONE,
+ NULL, widget, "trough", 0, 0, -1, -1);
+
+ GTK_PROGRESS_BAR_GET_CLASS (pbar)->paint (pbar);
+ }
+}
+
+static void
+gtk_progress_bar_style_set (GtkWidget *widget,
+ GtkStyle *previous)
{
GtkProgressBar *pbar = GTK_PROGRESS_BAR (widget);
@@ -532,64 +633,62 @@ gtk_progress_bar_style_set (GtkWidget *widget,
}
static void
-gtk_progress_bar_act_mode_enter (GtkProgress *progress)
+gtk_progress_bar_act_mode_enter (GtkProgressBar *pbar)
{
- GtkProgressBar *pbar;
GtkWidget *widget;
GtkProgressBarOrientation orientation;
- pbar = GTK_PROGRESS_BAR (progress);
- widget = GTK_WIDGET (progress);
+ widget = GTK_WIDGET (pbar);
orientation = pbar->orientation;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
{
if (pbar->orientation == GTK_PROGRESS_LEFT_TO_RIGHT)
- orientation = GTK_PROGRESS_RIGHT_TO_LEFT;
+ orientation = GTK_PROGRESS_RIGHT_TO_LEFT;
else if (pbar->orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
- orientation = GTK_PROGRESS_LEFT_TO_RIGHT;
+ orientation = GTK_PROGRESS_LEFT_TO_RIGHT;
}
-
+
/* calculate start pos */
if (orientation == GTK_PROGRESS_LEFT_TO_RIGHT ||
orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
{
if (orientation == GTK_PROGRESS_LEFT_TO_RIGHT)
- {
- pbar->activity_pos = widget->style->xthickness;
- pbar->activity_dir = 0;
- }
+ {
+ pbar->activity_pos = widget->style->xthickness;
+ pbar->activity_dir = 0;
+ }
else
- {
- pbar->activity_pos = widget->allocation.width -
- widget->style->xthickness - (widget->allocation.height -
- widget->style->ythickness * 2);
- pbar->activity_dir = 1;
- }
+ {
+ pbar->activity_pos = widget->allocation.width -
+ widget->style->xthickness - (widget->allocation.height -
+ widget->style->ythickness * 2);
+ pbar->activity_dir = 1;
+ }
}
else
{
if (orientation == GTK_PROGRESS_TOP_TO_BOTTOM)
- {
- pbar->activity_pos = widget->style->ythickness;
- pbar->activity_dir = 0;
- }
+ {
+ pbar->activity_pos = widget->style->ythickness;
+ pbar->activity_dir = 0;
+ }
else
- {
- pbar->activity_pos = widget->allocation.height -
- widget->style->ythickness - (widget->allocation.width -
- widget->style->xthickness * 2);
- pbar->activity_dir = 1;
- }
+ {
+ pbar->activity_pos = widget->allocation.height -
+ widget->style->ythickness - (widget->allocation.width -
+ widget->style->xthickness * 2);
+ pbar->activity_dir = 1;
+ }
}
}
static void
gtk_progress_bar_get_activity (GtkProgressBar *pbar,
- GtkProgressBarOrientation orientation,
- gint *offset,
- gint *amount)
+ GtkProgressBarOrientation orientation,
+ gint *offset,
+ gint *amount)
{
GtkWidget *widget = GTK_WIDGET (pbar);
@@ -611,10 +710,9 @@ gtk_progress_bar_get_activity (GtkProgressBar *pbar,
static void
gtk_progress_bar_paint_activity (GtkProgressBar *pbar,
- GtkProgressBarOrientation orientation)
+ GtkProgressBarOrientation orientation)
{
GtkWidget *widget = GTK_WIDGET (pbar);
- GtkProgress *progress = GTK_PROGRESS (pbar);
GdkRectangle area;
switch (orientation)
@@ -639,16 +737,16 @@ gtk_progress_bar_paint_activity (GtkProgressBar *pbar,
}
gtk_paint_box (widget->style,
- progress->offscreen_pixmap,
- GTK_STATE_PRELIGHT, GTK_SHADOW_OUT,
- &area, widget, "bar",
- area.x, area.y, area.width, area.height);
+ pbar->offscreen_pixmap,
+ GTK_STATE_PRELIGHT, GTK_SHADOW_OUT,
+ &area, widget, "bar",
+ area.x, area.y, area.width, area.height);
}
static void
gtk_progress_bar_paint_continuous (GtkProgressBar *pbar,
- gint amount,
- GtkProgressBarOrientation orientation)
+ gint amount,
+ GtkProgressBarOrientation orientation)
{
GdkRectangle area;
GtkWidget *widget = GTK_WIDGET (pbar);
@@ -663,95 +761,41 @@ gtk_progress_bar_paint_continuous (GtkProgressBar *pbar,
area.width = amount;
area.height = widget->allocation.height - widget->style->ythickness * 2;
area.y = widget->style->ythickness;
-
+
area.x = widget->style->xthickness;
if (orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
- area.x = widget->allocation.width - amount - area.x;
+ area.x = widget->allocation.width - amount - area.x;
break;
-
+
case GTK_PROGRESS_TOP_TO_BOTTOM:
case GTK_PROGRESS_BOTTOM_TO_TOP:
area.width = widget->allocation.width - widget->style->xthickness * 2;
area.height = amount;
area.x = widget->style->xthickness;
-
+
area.y = widget->style->ythickness;
if (orientation == GTK_PROGRESS_BOTTOM_TO_TOP)
- area.y = widget->allocation.height - amount - area.y;
+ area.y = widget->allocation.height - amount - area.y;
break;
-
+
default:
return;
break;
}
-
- gtk_paint_box (widget->style,
- GTK_PROGRESS (pbar)->offscreen_pixmap,
- GTK_STATE_PRELIGHT, GTK_SHADOW_OUT,
- &area, widget, "bar",
- area.x, area.y, area.width, area.height);
-}
-static void
-gtk_progress_bar_paint_discrete (GtkProgressBar *pbar,
- GtkProgressBarOrientation orientation)
-{
- GtkWidget *widget = GTK_WIDGET (pbar);
- gint i;
-
- for (i = 0; i <= pbar->in_block; i++)
- {
- GdkRectangle area;
- gint space;
-
- switch (orientation)
- {
- case GTK_PROGRESS_LEFT_TO_RIGHT:
- case GTK_PROGRESS_RIGHT_TO_LEFT:
- space = widget->allocation.width - 2 * widget->style->xthickness;
-
- area.x = widget->style->xthickness + (i * space) / pbar->blocks;
- area.y = widget->style->ythickness;
- area.width = widget->style->xthickness + ((i + 1) * space) / pbar->blocks - area.x;
- area.height = widget->allocation.height - 2 * widget->style->ythickness;
-
- if (orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
- area.x = widget->allocation.width - area.width - area.x;
- break;
-
- case GTK_PROGRESS_TOP_TO_BOTTOM:
- case GTK_PROGRESS_BOTTOM_TO_TOP:
- space = widget->allocation.height - 2 * widget->style->ythickness;
-
- area.x = widget->style->xthickness;
- area.y = widget->style->ythickness + (i * space) / pbar->blocks;
- area.width = widget->allocation.width - 2 * widget->style->xthickness;
- area.height = widget->style->ythickness + ((i + 1) * space) / pbar->blocks - area.y;
-
- if (orientation == GTK_PROGRESS_BOTTOM_TO_TOP)
- area.y = widget->allocation.height - area.height - area.y;
- break;
-
- default:
- return;
- break;
- }
-
- gtk_paint_box (widget->style,
- GTK_PROGRESS (pbar)->offscreen_pixmap,
- GTK_STATE_PRELIGHT, GTK_SHADOW_OUT,
- &area, widget, "bar",
- area.x, area.y, area.width, area.height);
- }
+ gtk_paint_box (widget->style,
+ pbar->offscreen_pixmap,
+ GTK_STATE_PRELIGHT, GTK_SHADOW_OUT,
+ &area, widget, "bar",
+ area.x, area.y, area.width, area.height);
}
static void
gtk_progress_bar_paint_text (GtkProgressBar *pbar,
- gint offset,
- gint amount,
- GtkProgressBarOrientation orientation)
+ gint offset,
+ gint amount,
+ GtkProgressBarOrientation orientation)
{
- GtkProgress *progress = GTK_PROGRESS (pbar);
GtkWidget *widget = GTK_WIDGET (pbar);
gint x;
gint y;
@@ -760,21 +804,21 @@ gtk_progress_bar_paint_text (GtkProgressBar *pbar,
PangoLayout *layout;
PangoRectangle logical_rect;
GdkRectangle prelight_clip, start_clip, end_clip;
- gfloat text_xalign = progress->x_align;
- gfloat text_yalign = progress->y_align;
+ gfloat text_xalign = 0.5;
+ gfloat text_yalign = 0.5;
if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
text_xalign = 1.0 - text_xalign;
- buf = gtk_progress_get_current_text (progress);
-
+ buf = get_current_text (pbar);
+
layout = gtk_widget_create_pango_layout (widget, buf);
pango_layout_set_ellipsize (layout, pbar->ellipsize);
if (pbar->ellipsize)
pango_layout_set_width (layout, widget->allocation.width * PANGO_SCALE);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-
+
x = widget->style->xthickness + 1 + text_xalign *
(widget->allocation.width - 2 * widget->style->xthickness -
2 - logical_rect.width);
@@ -794,38 +838,38 @@ gtk_progress_bar_paint_text (GtkProgressBar *pbar,
{
case GTK_PROGRESS_LEFT_TO_RIGHT:
if (offset != -1)
- prelight_clip.x = offset;
+ prelight_clip.x = offset;
prelight_clip.width = amount;
start_clip.width = prelight_clip.x - start_clip.x;
end_clip.x = start_clip.x + start_clip.width + prelight_clip.width;
end_clip.width -= prelight_clip.width + start_clip.width;
break;
-
+
case GTK_PROGRESS_RIGHT_TO_LEFT:
if (offset != -1)
- prelight_clip.x = offset;
+ prelight_clip.x = offset;
else
- prelight_clip.x = rect.x + rect.width - amount;
+ prelight_clip.x = rect.x + rect.width - amount;
prelight_clip.width = amount;
start_clip.width = prelight_clip.x - start_clip.x;
end_clip.x = start_clip.x + start_clip.width + prelight_clip.width;
end_clip.width -= prelight_clip.width + start_clip.width;
break;
-
+
case GTK_PROGRESS_TOP_TO_BOTTOM:
if (offset != -1)
- prelight_clip.y = offset;
+ prelight_clip.y = offset;
prelight_clip.height = amount;
start_clip.height = prelight_clip.y - start_clip.y;
end_clip.y = start_clip.y + start_clip.height + prelight_clip.height;
end_clip.height -= prelight_clip.height + start_clip.height;
break;
-
+
case GTK_PROGRESS_BOTTOM_TO_TOP:
if (offset != -1)
- prelight_clip.y = offset;
+ prelight_clip.y = offset;
else
- prelight_clip.y = rect.y + rect.height - amount;
+ prelight_clip.y = rect.y + rect.height - amount;
prelight_clip.height = amount;
start_clip.height = prelight_clip.y - start_clip.y;
end_clip.y = start_clip.y + start_clip.height + prelight_clip.height;
@@ -835,128 +879,132 @@ gtk_progress_bar_paint_text (GtkProgressBar *pbar,
if (start_clip.width > 0 && start_clip.height > 0)
gtk_paint_layout (widget->style,
- progress->offscreen_pixmap,
- GTK_STATE_NORMAL,
- FALSE,
- &start_clip,
- widget,
- "progressbar",
- x, y,
- layout);
+ pbar->offscreen_pixmap,
+ GTK_STATE_NORMAL,
+ FALSE,
+ &start_clip,
+ widget,
+ "progressbar",
+ x, y,
+ layout);
if (end_clip.width > 0 && end_clip.height > 0)
gtk_paint_layout (widget->style,
- progress->offscreen_pixmap,
- GTK_STATE_NORMAL,
- FALSE,
- &end_clip,
- widget,
- "progressbar",
- x, y,
- layout);
+ pbar->offscreen_pixmap,
+ GTK_STATE_NORMAL,
+ FALSE,
+ &end_clip,
+ widget,
+ "progressbar",
+ x, y,
+ layout);
gtk_paint_layout (widget->style,
- progress->offscreen_pixmap,
- GTK_STATE_PRELIGHT,
- FALSE,
- &prelight_clip,
- widget,
- "progressbar",
- x, y,
- layout);
+ pbar->offscreen_pixmap,
+ GTK_STATE_PRELIGHT,
+ FALSE,
+ &prelight_clip,
+ widget,
+ "progressbar",
+ x, y,
+ layout);
g_object_unref (layout);
g_free (buf);
}
static void
-gtk_progress_bar_paint (GtkProgress *progress)
+gtk_progress_bar_paint (GtkProgressBar *pbar)
{
- GtkProgressBar *pbar;
GtkProgressBarPrivate *priv;
GtkWidget *widget;
-
GtkProgressBarOrientation orientation;
- g_return_if_fail (GTK_IS_PROGRESS_BAR (progress));
-
- pbar = GTK_PROGRESS_BAR (progress);
priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar);
- widget = GTK_WIDGET (progress);
+ widget = GTK_WIDGET (pbar);
orientation = pbar->orientation;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
{
if (pbar->orientation == GTK_PROGRESS_LEFT_TO_RIGHT)
- orientation = GTK_PROGRESS_RIGHT_TO_LEFT;
+ orientation = GTK_PROGRESS_RIGHT_TO_LEFT;
else if (pbar->orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
- orientation = GTK_PROGRESS_LEFT_TO_RIGHT;
+ orientation = GTK_PROGRESS_LEFT_TO_RIGHT;
}
-
- if (progress->offscreen_pixmap)
+
+ if (pbar->offscreen_pixmap)
{
gtk_paint_box (widget->style,
- progress->offscreen_pixmap,
- GTK_STATE_NORMAL, GTK_SHADOW_IN,
- NULL, widget, "trough",
- 0, 0,
- widget->allocation.width,
- widget->allocation.height);
-
- if (progress->activity_mode)
- {
- gtk_progress_bar_paint_activity (pbar, orientation);
-
- if (priv->text)
- {
- gint offset;
- gint amount;
-
- gtk_progress_bar_get_activity (pbar, orientation, &offset, &amount);
- gtk_progress_bar_paint_text (pbar, offset, amount, orientation);
- }
- }
+ pbar->offscreen_pixmap,
+ GTK_STATE_NORMAL, GTK_SHADOW_IN,
+ NULL, widget, "trough",
+ 0, 0,
+ widget->allocation.width,
+ widget->allocation.height);
+
+ if (pbar->activity_mode)
+ {
+ gtk_progress_bar_paint_activity (pbar, orientation);
+
+ if (pbar->show_text)
+ {
+ gint offset;
+ gint amount;
+
+ gtk_progress_bar_get_activity (pbar, orientation, &offset, &amount);
+ gtk_progress_bar_paint_text (pbar, offset, amount, orientation);
+ }
+ }
else
- {
- gint amount;
- gint space;
-
- if (orientation == GTK_PROGRESS_LEFT_TO_RIGHT ||
- orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
- space = widget->allocation.width - 2 * widget->style->xthickness;
- else
- space = widget->allocation.height - 2 * widget->style->ythickness;
-
- amount = space *
- gtk_progress_get_current_percentage (GTK_PROGRESS (pbar));
-
- if (pbar->bar_style == GTK_PROGRESS_CONTINUOUS)
- {
- gtk_progress_bar_paint_continuous (pbar, amount, orientation);
-
- if (priv->text)
- gtk_progress_bar_paint_text (pbar, -1, amount, orientation);
- }
- else
- gtk_progress_bar_paint_discrete (pbar, orientation);
- }
+ {
+ gint amount;
+ gint space;
+
+ if (orientation == GTK_PROGRESS_LEFT_TO_RIGHT ||
+ orientation == GTK_PROGRESS_RIGHT_TO_LEFT)
+ space = widget->allocation.width - 2 * widget->style->xthickness;
+ else
+ space = widget->allocation.height - 2 * widget->style->ythickness;
+
+ amount = space * gtk_progress_bar_get_fraction (pbar);
+
+ gtk_progress_bar_paint_continuous (pbar, amount, orientation);
+
+ if (pbar->show_text)
+ gtk_progress_bar_paint_text (pbar, -1, amount, orientation);
+ }
pbar->dirty = FALSE;
}
}
+static void
+gtk_progress_bar_set_activity_mode (GtkProgressBar *pbar,
+ gboolean activity_mode)
+{
+ activity_mode = !!activity_mode;
+
+ if (pbar->activity_mode != activity_mode)
+ {
+ pbar->activity_mode = activity_mode;
-/*******************************************************************/
+ if (pbar->activity_mode)
+ GTK_PROGRESS_BAR_GET_CLASS (pbar)->act_mode_enter (pbar);
+
+ if (gtk_widget_is_drawable (GTK_WIDGET (pbar)))
+ gtk_widget_queue_resize (GTK_WIDGET (pbar));
+ }
+}
/**
* gtk_progress_bar_set_fraction:
* @pbar: a #GtkProgressBar
* @fraction: fraction of the task that's been completed
- *
+ *
* Causes the progress bar to "fill in" the given fraction
* of the bar. The fraction should be between 0.0 and 1.0,
* inclusive.
- *
+ *
**/
void
gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
@@ -968,8 +1016,8 @@ gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar);
priv->fraction = fraction;
- gtk_progress_set_activity_mode (GTK_PROGRESS (pbar), FALSE);
- gtk_progress_set_percentage (GTK_PROGRESS (pbar), fraction);
+ gtk_progress_bar_set_activity_mode (pbar, FALSE);
+ gtk_progress_bar_real_update (pbar);
g_object_notify (G_OBJECT (pbar), "fraction");
}
@@ -977,7 +1025,7 @@ gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
/**
* gtk_progress_bar_pulse:
* @pbar: a #GtkProgressBar
- *
+ *
* Indicates that some progress is made, but you don't know how much.
* Causes the progress bar to enter "activity mode," where a block
* bounces back and forth. Each call to gtk_progress_bar_pulse()
@@ -986,19 +1034,18 @@ gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
**/
void
gtk_progress_bar_pulse (GtkProgressBar *pbar)
-{
+{
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
- /* Sigh. */
- gtk_progress_set_activity_mode (GTK_PROGRESS (pbar), TRUE);
- gtk_progress_bar_real_update (GTK_PROGRESS (pbar));
+ gtk_progress_bar_set_activity_mode (pbar, TRUE);
+ gtk_progress_bar_real_update (pbar);
}
/**
* gtk_progress_bar_set_text:
* @pbar: a #GtkProgressBar
- * @text: (allow-none): a UTF-8 string, or %NULL
- *
+ * @text: (allow-none): a UTF-8 string, or %NULL
+ *
* Causes the given @text to appear superimposed on the progress bar.
**/
void
@@ -1008,31 +1055,81 @@ gtk_progress_bar_set_text (GtkProgressBar *pbar,
GtkProgressBarPrivate *priv;
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
-
+
priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar);
g_free (priv->text);
priv->text = text && *text ? g_strdup (text) : NULL;
- gtk_progress_set_show_text (GTK_PROGRESS (pbar), text && *text);
- gtk_progress_set_format_string (GTK_PROGRESS (pbar), text);
- GTK_PROGRESS (pbar)->use_text_format = (text == NULL);
-
+
+ if (gtk_widget_is_drawable (GTK_WIDGET (pbar)))
+ gtk_widget_queue_resize (GTK_WIDGET (pbar));
+
g_object_notify (G_OBJECT (pbar), "text");
}
/**
+ * gtk_progress_bar_set_show_text:
+ * @pbar: a #GtkProgressBar
+ * @show_text: whether to show superimposed text
+ *
+ * Sets whether the progressbar will show text superimposed
+ * over the bar. The shown text is either the value of
+ * the #GtkProgressBar::text property or, if that is %NULL,
+ * the #GtkProgressBar::fraction value, as a percentage.
+ *
+ * Since: 3.0
+ */
+void
+gtk_progress_bar_set_show_text (GtkProgressBar *pbar,
+ gboolean show_text)
+{
+ g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
+
+ show_text = !!show_text;
+
+ if (pbar->show_text != show_text)
+ {
+ pbar->show_text = show_text;
+
+ if (gtk_widget_is_drawable (GTK_WIDGET (pbar)))
+ gtk_widget_queue_resize (GTK_WIDGET (pbar));
+
+ g_object_notify (G_OBJECT (pbar), "show-text");
+ }
+}
+
+/**
+ * gtk_progress_bar_get_show_text:
+ * @pbar: a #GtkProgressBar
+ *
+ * Gets the value of the #GtkProgressBar::show-text property.
+ * See gtk_progress_bar_set_show_text().
+ *
+ * Returns: %TRUE if text is shown in the progress bar
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_progress_bar_get_show_text (GtkProgressBar *pbar)
+{
+ g_return_val_if_fail (GTK_IS_PROGRESS_BAR (pbar), FALSE);
+
+ return pbar->show_text;
+}
+
+/**
* gtk_progress_bar_set_pulse_step:
* @pbar: a #GtkProgressBar
* @fraction: fraction between 0.0 and 1.0
- *
+ *
* Sets the fraction of total progress bar length to move the
* bouncing block for each call to gtk_progress_bar_pulse().
**/
void
-gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
- gdouble fraction)
+gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
+ gdouble fraction)
{
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
-
+
pbar->pulse_fraction = fraction;
g_object_notify (G_OBJECT (pbar), "pulse-step");
@@ -1042,13 +1139,13 @@ gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
* gtk_progress_bar_set_orientation:
* @pbar: a #GtkProgressBar
* @orientation: orientation of the progress bar
- *
+ *
* Causes the progress bar to switch to a different orientation
- * (left-to-right, right-to-left, top-to-bottom, or bottom-to-top).
+ * (left-to-right, right-to-left, top-to-bottom, or bottom-to-top).
**/
void
gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
- GtkProgressBarOrientation orientation)
+ GtkProgressBarOrientation orientation)
{
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
@@ -1057,7 +1154,7 @@ gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
pbar->orientation = orientation;
if (gtk_widget_is_drawable (GTK_WIDGET (pbar)))
- gtk_widget_queue_resize (GTK_WIDGET (pbar));
+ gtk_widget_queue_resize (GTK_WIDGET (pbar));
g_object_notify (G_OBJECT (pbar), "orientation");
}
@@ -1066,12 +1163,12 @@ gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
/**
* gtk_progress_bar_get_text:
* @pbar: a #GtkProgressBar
- *
+ *
* Retrieves the text displayed superimposed on the progress bar,
* if any, otherwise %NULL. The return value is a reference
* to the text, not a copy of it, so will become invalid
* if you change the text in the progress bar.
- *
+ *
* Return value: text, or %NULL; this string is owned by the widget
* and should not be modified or freed.
**/
@@ -1089,9 +1186,9 @@ gtk_progress_bar_get_text (GtkProgressBar *pbar)
/**
* gtk_progress_bar_get_fraction:
* @pbar: a #GtkProgressBar
- *
+ *
* Returns the current fraction of the task that's been completed.
- *
+ *
* Return value: a fraction from 0.0 to 1.0
**/
gdouble
@@ -1108,9 +1205,9 @@ gtk_progress_bar_get_fraction (GtkProgressBar *pbar)
/**
* gtk_progress_bar_get_pulse_step:
* @pbar: a #GtkProgressBar
- *
+ *
* Retrieves the pulse step set with gtk_progress_bar_set_pulse_step()
- *
+ *
* Return value: a fraction from 0.0 to 1.0
**/
gdouble
@@ -1124,9 +1221,9 @@ gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar)
/**
* gtk_progress_bar_get_orientation:
* @pbar: a #GtkProgressBar
- *
+ *
* Retrieves the current progress bar orientation.
- *
+ *
* Return value: orientation of the progress bar
**/
GtkProgressBarOrientation
@@ -1142,19 +1239,19 @@ gtk_progress_bar_get_orientation (GtkProgressBar *pbar)
* @pbar: a #GtkProgressBar
* @mode: a #PangoEllipsizeMode
*
- * Sets the mode used to ellipsize (add an ellipsis: "...") the text
+ * Sets the mode used to ellipsize (add an ellipsis: "...") the text
* if there is not enough space to render the entire string.
*
* Since: 2.6
**/
void
gtk_progress_bar_set_ellipsize (GtkProgressBar *pbar,
- PangoEllipsizeMode mode)
+ PangoEllipsizeMode mode)
{
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
- g_return_if_fail (mode >= PANGO_ELLIPSIZE_NONE &&
- mode <= PANGO_ELLIPSIZE_END);
-
+ g_return_if_fail (mode >= PANGO_ELLIPSIZE_NONE &&
+ mode <= PANGO_ELLIPSIZE_END);
+
if ((PangoEllipsizeMode)pbar->ellipsize != mode)
{
pbar->ellipsize = mode;
@@ -1168,14 +1265,14 @@ gtk_progress_bar_set_ellipsize (GtkProgressBar *pbar,
* gtk_progress_bar_get_ellipsize:
* @pbar: a #GtkProgressBar
*
- * Returns the ellipsizing position of the progressbar.
+ * Returns the ellipsizing position of the progressbar.
* See gtk_progress_bar_set_ellipsize().
*
* Return value: #PangoEllipsizeMode
*
* Since: 2.6
**/
-PangoEllipsizeMode
+PangoEllipsizeMode
gtk_progress_bar_get_ellipsize (GtkProgressBar *pbar)
{
g_return_val_if_fail (GTK_IS_PROGRESS_BAR (pbar), PANGO_ELLIPSIZE_NONE);
@@ -1183,4 +1280,6 @@ gtk_progress_bar_get_ellipsize (GtkProgressBar *pbar)
return pbar->ellipsize;
}
+
+#define __GTK_PROGRESS_BAR_C__
#include "gtkaliasdef.c"
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index 625825f..c2fe308 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -31,9 +31,7 @@
#ifndef __GTK_PROGRESS_BAR_H__
#define __GTK_PROGRESS_BAR_H__
-
-#include <gtk/gtkprogress.h>
-
+#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
@@ -50,12 +48,6 @@ typedef struct _GtkProgressBarClass GtkProgressBarClass;
typedef enum
{
- GTK_PROGRESS_CONTINUOUS,
- GTK_PROGRESS_DISCRETE
-} GtkProgressBarStyle;
-
-typedef enum
-{
GTK_PROGRESS_LEFT_TO_RIGHT,
GTK_PROGRESS_RIGHT_TO_LEFT,
GTK_PROGRESS_BOTTOM_TO_TOP,
@@ -64,9 +56,10 @@ typedef enum
struct _GtkProgressBar
{
- GtkProgress progress;
+ GtkWidget parent;
+
+ GdkPixmap *GSEAL (offscreen_pixmap);
- GtkProgressBarStyle GSEAL (bar_style);
GtkProgressBarOrientation GSEAL (orientation);
guint GSEAL (blocks);
@@ -81,17 +74,27 @@ struct _GtkProgressBar
guint GSEAL (activity_dir) : 1;
guint GSEAL (ellipsize) : 3;
guint GSEAL (dirty) : 1;
+ guint GSEAL (activity_mode) : 1;
+ guint GSEAL (show_text) : 1;
};
struct _GtkProgressBarClass
{
- GtkProgressClass parent_class;
+ GtkWidgetClass parent_class;
+
+ void (* paint) (GtkProgressBar *progress);
+ void (* update) (GtkProgressBar *progress);
+ void (* act_mode_enter) (GtkProgressBar *progress);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
+ void (*_gtk_reserved5) (void);
+ void (*_gtk_reserved6) (void);
+ void (*_gtk_reserved7) (void);
+ void (*_gtk_reserved8) (void);
};
@@ -107,7 +110,7 @@ void gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
void gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
gdouble fraction);
void gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
- GtkProgressBarOrientation orientation);
+ GtkProgressBarOrientation orientation);
G_CONST_RETURN gchar* gtk_progress_bar_get_text (GtkProgressBar *pbar);
gdouble gtk_progress_bar_get_fraction (GtkProgressBar *pbar);
@@ -115,9 +118,12 @@ gdouble gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
GtkProgressBarOrientation gtk_progress_bar_get_orientation (GtkProgressBar *pbar);
void gtk_progress_bar_set_ellipsize (GtkProgressBar *pbar,
- PangoEllipsizeMode mode);
+ PangoEllipsizeMode mode);
PangoEllipsizeMode gtk_progress_bar_get_ellipsize (GtkProgressBar *pbar);
+void gtk_progress_bar_set_show_text (GtkProgressBar *pbar,
+ gboolean show_text);
+gboolean gtk_progress_bar_get_show_text (GtkProgressBar *pbar);
G_END_DECLS
diff --git a/modules/other/gail/gailprogressbar.c b/modules/other/gail/gailprogressbar.c
index 31dd7ad..76e4299 100644
--- a/modules/other/gail/gailprogressbar.c
+++ b/modules/other/gail/gailprogressbar.c
@@ -32,8 +32,6 @@ static void gail_progress_bar_class_init (GailProgressBarClass *klass);
static void gail_progress_bar_init (GailProgressBar *bar);
static void gail_progress_bar_real_initialize (AtkObject *obj,
gpointer data);
-static void gail_progress_bar_finalize (GObject *object);
-
static void atk_value_interface_init (AtkValueIface *iface);
@@ -47,13 +45,11 @@ static void gail_progress_bar_get_maximum_value (AtkValue *obj,
GValue *value);
static void gail_progress_bar_get_minimum_value (AtkValue *obj,
GValue *value);
-static void gail_progress_bar_value_changed (GtkAdjustment *adjustment,
- gpointer data);
G_DEFINE_TYPE_WITH_CODE (GailProgressBar, gail_progress_bar, GAIL_TYPE_WIDGET,
G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
-static void
+static void
gail_progress_bar_class_init (GailProgressBarClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@@ -65,8 +61,6 @@ gail_progress_bar_class_init (GailProgressBarClass *klass)
widget_class->notify_gtk = gail_progress_bar_real_notify_gtk;
class->initialize = gail_progress_bar_real_initialize;
-
- gobject_class->finalize = gail_progress_bar_finalize;
}
static void
@@ -79,30 +73,13 @@ gail_progress_bar_real_initialize (AtkObject *obj,
gpointer data)
{
GailProgressBar *progress_bar = GAIL_PROGRESS_BAR (obj);
- GtkProgress *gtk_progress;
ATK_OBJECT_CLASS (gail_progress_bar_parent_class)->initialize (obj, data);
- gtk_progress = GTK_PROGRESS (data);
- /*
- * If a GtkAdjustment already exists for the spin_button,
- * create the GailAdjustment
- */
- if (gtk_progress->adjustment)
- {
- progress_bar->adjustment = gail_adjustment_new (gtk_progress->adjustment);
- g_signal_connect (gtk_progress->adjustment,
- "value-changed",
- G_CALLBACK (gail_progress_bar_value_changed),
- obj);
- }
- else
- progress_bar->adjustment = NULL;
-
obj->role = ATK_ROLE_PROGRESS_BAR;
}
-static void
+static void
atk_value_interface_init (AtkValueIface *iface)
{
iface->get_current_value = gail_progress_bar_get_current_value;
@@ -110,75 +87,37 @@ atk_value_interface_init (AtkValueIface *iface)
iface->get_minimum_value = gail_progress_bar_get_minimum_value;
}
-static void
+static void
gail_progress_bar_get_current_value (AtkValue *obj,
GValue *value)
{
- GailProgressBar *progress_bar;
+ GtkWidget *widget;
g_return_if_fail (GAIL_IS_PROGRESS_BAR (obj));
- progress_bar = GAIL_PROGRESS_BAR (obj);
- if (progress_bar->adjustment == NULL)
- /*
- * Adjustment has not been specified
- */
- return;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
- atk_value_get_current_value (ATK_VALUE (progress_bar->adjustment), value);
+ g_value_set_double (value, gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (widget)));
}
-static void
+static void
gail_progress_bar_get_maximum_value (AtkValue *obj,
GValue *value)
{
- GailProgressBar *progress_bar;
-
g_return_if_fail (GAIL_IS_PROGRESS_BAR (obj));
- progress_bar = GAIL_PROGRESS_BAR (obj);
- if (progress_bar->adjustment == NULL)
- /*
- * Adjustment has not been specified
- */
- return;
-
- atk_value_get_maximum_value (ATK_VALUE (progress_bar->adjustment), value);
+ g_value_set_double (value, 1.0);
}
static void
gail_progress_bar_get_minimum_value (AtkValue *obj,
GValue *value)
{
- GailProgressBar *progress_bar;
-
g_return_if_fail (GAIL_IS_PROGRESS_BAR (obj));
- progress_bar = GAIL_PROGRESS_BAR (obj);
- if (progress_bar->adjustment == NULL)
- /*
- * Adjustment has not been specified
- */
- return;
-
- atk_value_get_minimum_value (ATK_VALUE (progress_bar->adjustment), value);
-}
-
-static void
-gail_progress_bar_finalize (GObject *object)
-{
- GailProgressBar *progress_bar = GAIL_PROGRESS_BAR (object);
-
- if (progress_bar->adjustment)
- {
- g_object_unref (progress_bar->adjustment);
- progress_bar->adjustment = NULL;
- }
-
- G_OBJECT_CLASS (gail_progress_bar_parent_class)->finalize (object);
+ g_value_set_double (value, 0.0);
}
-
static void
gail_progress_bar_real_notify_gtk (GObject *obj,
GParamSpec *pspec)
@@ -186,41 +125,8 @@ gail_progress_bar_real_notify_gtk (GObject *obj,
GtkWidget *widget = GTK_WIDGET (obj);
GailProgressBar *progress_bar = GAIL_PROGRESS_BAR (gtk_widget_get_accessible (widget));
- if (strcmp (pspec->name, "adjustment") == 0)
- {
- /*
- * Get rid of the GailAdjustment for the GtkAdjustment
- * which was associated with the progress_bar.
- */
- if (progress_bar->adjustment)
- {
- g_object_unref (progress_bar->adjustment);
- progress_bar->adjustment = NULL;
- }
- /*
- * Create the GailAdjustment when notify for "adjustment" property
- * is received
- */
- progress_bar->adjustment = gail_adjustment_new (GTK_PROGRESS (widget)->adjustment);
- g_signal_connect (GTK_PROGRESS (widget)->adjustment,
- "value-changed",
- G_CALLBACK (gail_progress_bar_value_changed),
- progress_bar);
- }
+ if (strcmp (pspec->name, "fraction") == 0)
+ g_object_notify (G_OBJECT (progress_bar), "accessible-value");
else
GAIL_WIDGET_CLASS (gail_progress_bar_parent_class)->notify_gtk (obj, pspec);
}
-
-static void
-gail_progress_bar_value_changed (GtkAdjustment *adjustment,
- gpointer data)
-{
- GailProgressBar *progress_bar;
-
- g_return_if_fail (adjustment != NULL);
- g_return_if_fail (data != NULL);
-
- progress_bar = GAIL_PROGRESS_BAR (data);
-
- g_object_notify (G_OBJECT (progress_bar), "accessible-value");
-}
diff --git a/modules/other/gail/gailprogressbar.h b/modules/other/gail/gailprogressbar.h
index 37e096a..3640448 100644
--- a/modules/other/gail/gailprogressbar.h
+++ b/modules/other/gail/gailprogressbar.h
@@ -37,8 +37,6 @@ typedef struct _GailProgressBarClass GailProgressBarClass;
struct _GailProgressBar
{
GailWidget parent;
-
- AtkObject *adjustment;
};
GType gail_progress_bar_get_type (void);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 2f76cac..abd1f7f 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -8908,10 +8908,7 @@ toggle_show_text (GtkWidget *widget, ProgressData *pdata)
gboolean active;
active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
- gtk_progress_bar_set_text (GTK_PROGRESS_BAR (pdata->pbar),
- active ? gtk_entry_get_text (GTK_ENTRY (pdata->entry)) : NULL);
-
- gtk_widget_set_sensitive (pdata->entry, active);
+ gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (pdata->pbar), active);
}
static void
@@ -9061,13 +9058,11 @@ create_progress_bar (GtkWidget *widget)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
pdata->entry = gtk_entry_new ();
- gtk_entry_set_text (GTK_ENTRY (pdata->entry), "Installing ...");
g_signal_connect (pdata->entry, "changed",
G_CALLBACK (entry_changed),
pdata);
gtk_box_pack_start (GTK_BOX (hbox), pdata->entry, TRUE, TRUE, 0);
gtk_widget_set_size_request (pdata->entry, 100, -1);
- gtk_widget_set_sensitive (pdata->entry, FALSE);
label = gtk_label_new ("Ellipsize text :");
gtk_table_attach (GTK_TABLE (tab), label, 0, 1, 10, 11,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
