#include <math.h>
#include <stdlib.h>
+#include "a11y/gtklevelbaraccessible.h"
+
+#include "fallback-c89.c"
+
#define DEFAULT_BLOCK_SIZE 3
/* these don't make sense outside of GtkLevelBar, so we don't add
PROP_MIN_VALUE,
PROP_MAX_VALUE,
PROP_MODE,
+ PROP_INVERTED,
LAST_PROPERTY,
PROP_ORIENTATION /* overridden */
};
GList *offsets;
GtkLevelBarMode bar_mode;
+
+ guint inverted : 1;
};
static void gtk_level_bar_set_value_internal (GtkLevelBar *self,
static void
gtk_level_bar_draw_fill_continuous (GtkLevelBar *self,
cairo_t *cr,
+ gboolean inverted,
cairo_rectangle_int_t *fill_area)
{
GtkWidget *widget = GTK_WIDGET (self);
(self->priv->max_value - self->priv->min_value);
if (self->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
- block_area.width = (gint) floor (block_area.width * fill_percentage);
+ {
+ block_area.width = (gint) floor (block_area.width * fill_percentage);
+
+ if (inverted)
+ block_area.x += base_area.width - block_area.width;
+ }
else
- block_area.height = (gint) floor (block_area.height * fill_percentage);
+ {
+ block_area.height = (gint) floor (block_area.height * fill_percentage);
+
+ if (inverted)
+ block_area.y += base_area.height - block_area.height;
+ }
gtk_render_background (context, cr, block_area.x, block_area.y,
block_area.width, block_area.height);
static void
gtk_level_bar_draw_fill_discrete (GtkLevelBar *self,
cairo_t *cr,
+ gboolean inverted,
cairo_rectangle_int_t *fill_area)
{
GtkWidget *widget = GTK_WIDGET (self);
{
block_draw_height = MAX (block_draw_height, block_area.height - block_margin.top - block_margin.bottom);
block_area.y += block_margin.top;
+
+ if (inverted)
+ block_area.x += block_area.width - block_draw_width;
}
else
{
block_draw_width = MAX (block_draw_width, block_area.width - block_margin.left - block_margin.right);
block_area.x += block_margin.left;
+
+ if (inverted)
+ block_area.y += block_area.height - block_draw_height;
}
for (idx = 0; idx < num_blocks; idx++)
{
if (self->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
- block_area.x += block_margin.left;
+ {
+ if (inverted)
+ block_area.x -= block_margin.right;
+ else
+ block_area.x += block_margin.left;
+ }
else
- block_area.y += block_margin.top;
+ {
+ if (inverted)
+ block_area.y -= block_margin.bottom;
+ else
+ block_area.y += block_margin.top;
+ }
if (idx > num_filled - 1)
gtk_style_context_add_class (context, STYLE_CLASS_EMPTY_FILL_BLOCK);
block_draw_width, block_draw_height);
if (self->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
- block_area.x += block_draw_width + block_margin.right;
+ {
+ if (inverted)
+ block_area.x -= block_draw_width + block_margin.left;
+ else
+ block_area.x += block_draw_width + block_margin.right;
+ }
else
- block_area.y += block_draw_height + block_margin.bottom;
+ {
+ if (inverted)
+ block_area.y -= block_draw_height + block_margin.top;
+ else
+ block_area.y += block_draw_height + block_margin.bottom;
+ }
}
gtk_style_context_restore (context);
{
GtkWidget *widget = GTK_WIDGET (self);
GtkBorder trough_borders;
+ gboolean inverted;
cairo_rectangle_int_t fill_area;
gtk_level_bar_get_borders (self, &trough_borders);
fill_area.height = gtk_widget_get_allocated_height (widget) -
trough_borders.top - trough_borders.bottom;
+ inverted = self->priv->inverted;
+ if (gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL)
+ {
+ if (self->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ inverted = !inverted;
+ }
+
if (self->priv->bar_mode == GTK_LEVEL_BAR_MODE_CONTINUOUS)
- gtk_level_bar_draw_fill_continuous (self, cr, &fill_area);
+ gtk_level_bar_draw_fill_continuous (self, cr, inverted, &fill_area);
else if (self->priv->bar_mode == GTK_LEVEL_BAR_MODE_DISCRETE)
- gtk_level_bar_draw_fill_discrete (self, cr, &fill_area);
+ gtk_level_bar_draw_fill_discrete (self, cr, inverted, &fill_area);
}
static gboolean
if (name && value_str)
{
- offset = gtk_level_bar_offset_new (name, strtof (value_str, NULL));
+ offset = gtk_level_bar_offset_new (name, g_ascii_strtod (value_str, NULL));
parser_data->offsets = g_list_prepend (parser_data->offsets, offset);
}
}
case PROP_MODE:
g_value_set_enum (value, gtk_level_bar_get_mode (self));
break;
+ case PROP_INVERTED:
+ g_value_set_boolean (value, gtk_level_bar_get_inverted (self));
+ break;
case PROP_ORIENTATION:
g_value_set_enum (value, self->priv->orientation);
break;
case PROP_MODE:
gtk_level_bar_set_mode (self, g_value_get_enum (value));
break;
+ case PROP_INVERTED:
+ gtk_level_bar_set_inverted (self, g_value_get_boolean (value));
+ break;
case PROP_ORIENTATION:
gtk_level_bar_set_orientation (self, g_value_get_enum (value));
break;
GTK_LEVEL_BAR_MODE_CONTINUOUS,
G_PARAM_READWRITE);
+ /**
+ * GtkLevelBar:inverted:
+ *
+ * Level bars normally grow from top to bottom or left to right.
+ * Inverted level bars grow in the opposite direction.
+ *
+ * Since: 3.8
+ */
+ properties[PROP_INVERTED] =
+ g_param_spec_boolean ("inverted",
+ P_("Inverted"),
+ P_("Invert the direction in which the level bar grows"),
+ FALSE,
+ G_PARAM_READWRITE);
+
/**
* GtkLevelBar:min-block-height:
*
g_type_class_add_private (klass, sizeof (GtkLevelBarPrivate));
g_object_class_install_properties (oclass, LAST_PROPERTY, properties);
+
+ gtk_widget_class_set_accessible_type (wclass, GTK_TYPE_LEVEL_BAR_ACCESSIBLE);
}
static void
self->priv->orientation = GTK_ORIENTATION_HORIZONTAL;
_gtk_orientable_set_style_classes (GTK_ORIENTABLE (self));
+ self->priv->inverted = FALSE;
+
gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
}
}
}
+/**
+ * gtk_level_bar_get_inverted:
+ * @self: a #GtkLevelBar
+ *
+ * Return the value of the #GtkLevelBar:inverted property.
+ *
+ * Return value: %TRUE if the level bar is inverted
+ *
+ * Since: 3.8
+ */
+gboolean
+gtk_level_bar_get_inverted (GtkLevelBar *self)
+{
+ g_return_val_if_fail (GTK_IS_LEVEL_BAR (self), FALSE);
+
+ return self->priv->inverted;
+}
+
+/**
+ * gtk_level_bar_set_inverted:
+ * @self: a #GtkLevelBar
+ * @inverted: %TRUE to invert the level bar
+ *
+ * Sets the value of the #GtkLevelBar:inverted property.
+ *
+ * Since: 3.8
+ */
+void
+gtk_level_bar_set_inverted (GtkLevelBar *self,
+ gboolean inverted)
+{
+ GtkLevelBarPrivate *priv;
+
+ g_return_if_fail (GTK_IS_LEVEL_BAR (self));
+
+ priv = self->priv;
+
+ if (priv->inverted != inverted)
+ {
+ priv->inverted = inverted;
+
+ gtk_widget_queue_resize (GTK_WIDGET (self));
+
+ g_object_notify (G_OBJECT (self), "inverted");
+ }
+}
+
/**
* gtk_level_bar_remove_offset_value:
* @self: a #GtkLevelBar
projects / ~andy / gtk / blobdiff