* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#include <stdio.h>
#include <math.h>
-#include <gdk/gdkkeysyms.h>
+#include "gtkrange.h"
+
+#include "gtkadjustment.h"
+#include "gtkcolorscaleprivate.h"
+#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtkorientable.h"
-#include "gtkrange.h"
+#include "gtkorientableprivate.h"
+#include "gtkprivate.h"
#include "gtkscale.h"
#include "gtkscrollbar.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkalias.h"
-
+#include "gtktypebuiltins.h"
+#include "gtkwindow.h"
+#include "a11y/gtkrangeaccessible.h"
/**
* SECTION:gtkrange
#define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */
#define UPDATE_DELAY 300 /* Delay for queued update */
-enum {
- PROP_0,
- PROP_ORIENTATION,
- PROP_UPDATE_POLICY,
- PROP_ADJUSTMENT,
- PROP_INVERTED,
- PROP_LOWER_STEPPER_SENSITIVITY,
- PROP_UPPER_STEPPER_SENSITIVITY,
- PROP_SHOW_FILL_LEVEL,
- PROP_RESTRICT_TO_FILL_LEVEL,
- PROP_FILL_LEVEL
-};
-
-enum {
- VALUE_CHANGED,
- ADJUST_BOUNDS,
- MOVE_SLIDER,
- CHANGE_VALUE,
- LAST_SIGNAL
-};
+typedef struct _GtkRangeStepTimer GtkRangeStepTimer;
typedef enum {
MOUSE_OUTSIDE,
MOUSE_WIDGET /* inside widget but not in any of the above GUI elements */
} MouseLocation;
-#define GTK_RANGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_RANGE, GtkRangeLayout))
-
-struct _GtkRangeLayout
+struct _GtkRangePrivate
{
+ MouseLocation mouse_location;
+ /* last mouse coords we got, or -1 if mouse is outside the range */
+ gint mouse_x;
+ gint mouse_y;
+ MouseLocation grab_location; /* "grabbed" mouse location, OUTSIDE for no grab */
+
+ GtkRangeStepTimer *timer;
+
+ GtkAdjustment *adjustment;
+ GtkSensitivityType lower_sensitivity;
+ GtkSensitivityType upper_sensitivity;
+
+ GdkDevice *grab_device;
+ GdkRectangle range_rect; /* Area of entire stepper + trough assembly in widget->window coords */
/* These are in widget->window coordinates */
- GdkRectangle stepper_a;
- GdkRectangle stepper_b;
- GdkRectangle stepper_c;
- GdkRectangle stepper_d;
- /* The trough rectangle is the area the thumb can slide in, not the
- * entire range_rect
- */
- GdkRectangle trough;
- GdkRectangle slider;
+ GdkRectangle stepper_a;
+ GdkRectangle stepper_b;
+ GdkRectangle stepper_c;
+ GdkRectangle stepper_d;
+ GdkRectangle trough; /* The trough rectangle is the area the thumb can slide in, not the entire range_rect */
+ GdkRectangle slider;
+ GdkWindow *event_window;
- /* Layout-related state */
-
- MouseLocation mouse_location;
- /* last mouse coords we got, or -1 if mouse is outside the range */
- gint mouse_x;
- gint mouse_y;
+ GQuark slider_detail_quark;
+ GQuark stepper_detail_quark[4];
- /* "grabbed" mouse location, OUTSIDE for no grab */
- MouseLocation grab_location;
- guint grab_button : 8; /* 0 if none */
+ GtkOrientation orientation;
+
+ gdouble fill_level;
+ gdouble *marks;
+
+ gint *mark_pos;
+ gint min_slider_size;
+ gint n_marks;
+ gint round_digits; /* Round off value to this many digits, -1 for no rounding */
+ gint slide_initial_slider_position;
+ gint slide_initial_coordinate;
+ gint slider_start; /* Slider range along the long dimension, in widget->window coords */
+ gint slider_end;
+
+ /* Steppers are: < > ---- < >
+ * a b c d
+ */
+ guint has_stepper_a : 1;
+ guint has_stepper_b : 1;
+ guint has_stepper_c : 1;
+ guint has_stepper_d : 1;
+
+ guint flippable : 1;
+ guint inverted : 1;
+ guint need_recalc : 1;
+ guint recalc_marks : 1;
+ guint slider_size_fixed : 1;
+ guint trough_click_forward : 1; /* trough click was on the forward side of slider */
/* Stepper sensitivity */
- guint lower_sensitive : 1;
- guint upper_sensitive : 1;
+ guint lower_sensitive : 1;
+ guint upper_sensitive : 1;
+
+ /* The range has an origin, should be drawn differently. Used by GtkScale */
+ guint has_origin : 1;
+
+ /* Whether we're doing fine adjustment */
+ guint zoom : 1;
/* Fill level */
- guint show_fill_level : 1;
+ guint show_fill_level : 1;
guint restrict_to_fill_level : 1;
- GtkSensitivityType lower_sensitivity;
- GtkSensitivityType upper_sensitivity;
- guint repaint_id;
+ guint grab_button : 8; /* 0 if none */
+};
- gdouble fill_level;
- GQuark slider_detail_quark;
- GQuark stepper_detail_quark;
-
- gdouble *marks;
- gint *mark_pos;
- gint n_marks;
- gboolean recalc_marks;
+enum {
+ PROP_0,
+ PROP_ORIENTATION,
+ PROP_ADJUSTMENT,
+ PROP_INVERTED,
+ PROP_LOWER_STEPPER_SENSITIVITY,
+ PROP_UPPER_STEPPER_SENSITIVITY,
+ PROP_SHOW_FILL_LEVEL,
+ PROP_RESTRICT_TO_FILL_LEVEL,
+ PROP_FILL_LEVEL,
+ PROP_ROUND_DIGITS
+};
- GdkDevice *grab_device;
+enum {
+ VALUE_CHANGED,
+ ADJUST_BOUNDS,
+ MOVE_SLIDER,
+ CHANGE_VALUE,
+ LAST_SIGNAL
};
+typedef enum {
+ STEPPER_A,
+ STEPPER_B,
+ STEPPER_C,
+ STEPPER_D
+} Stepper;
static void gtk_range_set_property (GObject *object,
guint prop_id,
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void gtk_range_destroy (GtkObject *object);
-static void gtk_range_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
+static void gtk_range_destroy (GtkWidget *widget);
+static void gtk_range_get_preferred_width
+ (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_range_get_preferred_height
+ (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
static void gtk_range_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
+static void gtk_range_hierarchy_changed (GtkWidget *widget,
+ GtkWidget *previous_toplevel);
static void gtk_range_realize (GtkWidget *widget);
static void gtk_range_unrealize (GtkWidget *widget);
static void gtk_range_map (GtkWidget *widget);
static void gtk_range_unmap (GtkWidget *widget);
-static gboolean gtk_range_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gboolean gtk_range_draw (GtkWidget *widget,
+ cairo_t *cr);
static gboolean gtk_range_button_press (GtkWidget *widget,
GdkEventButton *event);
static gboolean gtk_range_button_release (GtkWidget *widget,
GdkEventGrabBroken *event);
static void gtk_range_grab_notify (GtkWidget *widget,
gboolean was_grabbed);
-static void gtk_range_state_changed (GtkWidget *widget,
- GtkStateType previous_state);
+static void gtk_range_state_flags_changed (GtkWidget *widget,
+ GtkStateFlags previous_state);
static gboolean gtk_range_scroll_event (GtkWidget *widget,
GdkEventScroll *event);
-static void gtk_range_style_set (GtkWidget *widget,
- GtkStyle *previous_style);
+static void gtk_range_style_updated (GtkWidget *widget);
static void update_slider_position (GtkRange *range,
gint mouse_x,
gint mouse_y);
static void stop_scrolling (GtkRange *range);
+static gboolean modify_allocation_for_window_grip (GtkWidget *widget,
+ GtkAllocation *allocation);
/* Range methods */
static void gtk_range_add_step_timer (GtkRange *range,
GtkScrollType step);
static void gtk_range_remove_step_timer (GtkRange *range);
-static void gtk_range_reset_update_timer (GtkRange *range);
-static void gtk_range_remove_update_timer (GtkRange *range);
static GdkRectangle* get_area (GtkRange *range,
MouseLocation location);
static gboolean gtk_range_real_change_value (GtkRange *range,
GtkScrollType scroll,
gdouble value);
-static void gtk_range_update_value (GtkRange *range);
static gboolean gtk_range_key_press (GtkWidget *range,
GdkEventKey *event);
gtk_range_class_init (GtkRangeClass *class)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
gobject_class = G_OBJECT_CLASS (class);
- object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
gobject_class->set_property = gtk_range_set_property;
gobject_class->get_property = gtk_range_get_property;
- object_class->destroy = gtk_range_destroy;
-
- widget_class->size_request = gtk_range_size_request;
+ widget_class->destroy = gtk_range_destroy;
+ widget_class->get_preferred_width = gtk_range_get_preferred_width;
+ widget_class->get_preferred_height = gtk_range_get_preferred_height;
widget_class->size_allocate = gtk_range_size_allocate;
+ widget_class->hierarchy_changed = gtk_range_hierarchy_changed;
widget_class->realize = gtk_range_realize;
- widget_class->unrealize = gtk_range_unrealize;
+ widget_class->unrealize = gtk_range_unrealize;
widget_class->map = gtk_range_map;
widget_class->unmap = gtk_range_unmap;
- widget_class->expose_event = gtk_range_expose;
+ widget_class->draw = gtk_range_draw;
widget_class->button_press_event = gtk_range_button_press;
widget_class->button_release_event = gtk_range_button_release;
widget_class->motion_notify_event = gtk_range_motion_notify;
widget_class->leave_notify_event = gtk_range_leave_notify;
widget_class->grab_broken_event = gtk_range_grab_broken;
widget_class->grab_notify = gtk_range_grab_notify;
- widget_class->state_changed = gtk_range_state_changed;
- widget_class->style_set = gtk_range_style_set;
+ widget_class->state_flags_changed = gtk_range_state_flags_changed;
+ widget_class->style_updated = gtk_range_style_updated;
widget_class->key_press_event = gtk_range_key_press;
class->move_slider = gtk_range_move_slider;
* @range: the #GtkRange that received the signal
* @scroll: the type of scroll action that was performed
* @value: the new value resulting from the scroll action
- * @returns: %TRUE to prevent other handlers from being invoked for the
- * signal, %FALSE to propagate the signal further
*
- * The ::change-value signal is emitted when a scroll action is
+ * The #GtkRange::change-value signal is emitted when a scroll action is
* performed on a range. It allows an application to determine the
* type of scroll event that occurred and the resultant new value.
* The application can handle the event itself and return %TRUE to
* reached.
*
* The value parameter is unrounded. An application that overrides
- * the ::change-value signal is responsible for clamping the value to
- * the desired number of decimal digits; the default GTK+ handler
- * clamps the value based on @range->round_digits.
+ * the GtkRange::change-value signal is responsible for clamping the
+ * value to the desired number of decimal digits; the default GTK+
+ * handler clamps the value based on #GtkRange:round-digits.
*
* It is not possible to use delayed update policies in an overridden
- * ::change-value handler.
+ * #GtkRange::change-value handler.
+ *
+ * Returns: %TRUE to prevent other handlers from being invoked for
+ * the signal, %FALSE to propagate the signal further
*
* Since: 2.6
*/
PROP_ORIENTATION,
"orientation");
- g_object_class_install_property (gobject_class,
- PROP_UPDATE_POLICY,
- g_param_spec_enum ("update-policy",
- P_("Update policy"),
- P_("How the range should be updated on the screen"),
- GTK_TYPE_UPDATE_TYPE,
- GTK_UPDATE_CONTINUOUS,
- GTK_PARAM_READWRITE));
-
g_object_class_install_property (gobject_class,
PROP_ADJUSTMENT,
g_param_spec_object ("adjustment",
G_MAXDOUBLE,
GTK_PARAM_READWRITE));
+ /**
+ * GtkRange:round-digits:
+ *
+ * The number of digits to round the value to when
+ * it changes, or -1. See #GtkRange::change-value.
+ *
+ * Since: 2.24
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_ROUND_DIGITS,
+ g_param_spec_int ("round-digits",
+ P_("Round Digits"),
+ P_("The number of digits to round the value to."),
+ -1,
+ G_MAXINT,
+ -1,
+ GTK_PARAM_READWRITE));
+
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("slider-width",
P_("Slider Width"),
* GtkRange:stepper-spacing:
*
* The spacing between the stepper buttons and thumb. Note that
- * setting this value to anything > 0 will automatically set the
- * trough-under-steppers style property to %TRUE as well. Also,
* stepper-spacing won't have any effect if there are no steppers.
*/
gtk_widget_class_install_style_property (widget_class,
0,
GTK_PARAM_READABLE));
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_boolean ("activate-slider",
- P_("Draw slider ACTIVE during drag"),
- P_("With this option set to TRUE, sliders will be drawn ACTIVE and with shadow IN while they are dragged"),
- FALSE,
- GTK_PARAM_READABLE));
-
- /**
- * GtkRange:trough-side-details:
- *
- * When %TRUE, the parts of the trough on the two sides of the
- * slider are drawn with different details.
- *
- * Since: 2.10
- */
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_boolean ("trough-side-details",
- P_("Trough Side Details"),
- P_("When TRUE, the parts of the trough on the two sides of the slider are drawn with different details"),
- FALSE,
- GTK_PARAM_READABLE));
-
/**
* GtkRange:trough-under-steppers:
*
* Whether to draw the trough across the full length of the range or
- * to exclude the steppers and their spacing. Note that setting the
- * #GtkRange:stepper-spacing style property to any value > 0 will
- * automatically enable trough-under-steppers too.
+ * to exclude the steppers and their spacing.
*
* Since: 2.10
*/
0.0, 1.0, 0.5,
GTK_PARAM_READABLE));
- g_type_class_add_private (class, sizeof (GtkRangeLayout));
+ g_type_class_add_private (class, sizeof (GtkRangePrivate));
+
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RANGE_ACCESSIBLE);
}
static void
GParamSpec *pspec)
{
GtkRange *range = GTK_RANGE (object);
+ GtkRangePrivate *priv = range->priv;
switch (prop_id)
{
case PROP_ORIENTATION:
- range->orientation = g_value_get_enum (value);
+ priv->orientation = g_value_get_enum (value);
- range->layout->slider_detail_quark = 0;
- range->layout->stepper_detail_quark = 0;
+ priv->slider_detail_quark = 0;
+ priv->stepper_detail_quark[0] = 0;
+ priv->stepper_detail_quark[1] = 0;
+ priv->stepper_detail_quark[2] = 0;
+ priv->stepper_detail_quark[3] = 0;
+ _gtk_orientable_set_style_classes (GTK_ORIENTABLE (range));
gtk_widget_queue_resize (GTK_WIDGET (range));
break;
- case PROP_UPDATE_POLICY:
- gtk_range_set_update_policy (range, g_value_get_enum (value));
- break;
case PROP_ADJUSTMENT:
gtk_range_set_adjustment (range, g_value_get_object (value));
break;
case PROP_FILL_LEVEL:
gtk_range_set_fill_level (range, g_value_get_double (value));
break;
+ case PROP_ROUND_DIGITS:
+ gtk_range_set_round_digits (range, g_value_get_int (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
GParamSpec *pspec)
{
GtkRange *range = GTK_RANGE (object);
+ GtkRangePrivate *priv = range->priv;
switch (prop_id)
{
case PROP_ORIENTATION:
- g_value_set_enum (value, range->orientation);
- break;
- case PROP_UPDATE_POLICY:
- g_value_set_enum (value, range->update_policy);
+ g_value_set_enum (value, priv->orientation);
break;
case PROP_ADJUSTMENT:
- g_value_set_object (value, range->adjustment);
+ g_value_set_object (value, priv->adjustment);
break;
case PROP_INVERTED:
- g_value_set_boolean (value, range->inverted);
+ g_value_set_boolean (value, priv->inverted);
break;
case PROP_LOWER_STEPPER_SENSITIVITY:
g_value_set_enum (value, gtk_range_get_lower_stepper_sensitivity (range));
case PROP_FILL_LEVEL:
g_value_set_double (value, gtk_range_get_fill_level (range));
break;
+ case PROP_ROUND_DIGITS:
+ g_value_set_int (value, gtk_range_get_round_digits (range));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
static void
gtk_range_init (GtkRange *range)
{
+ GtkRangePrivate *priv;
+
+ range->priv = G_TYPE_INSTANCE_GET_PRIVATE (range,
+ GTK_TYPE_RANGE,
+ GtkRangePrivate);
+ priv = range->priv;
+
gtk_widget_set_has_window (GTK_WIDGET (range), FALSE);
- range->orientation = GTK_ORIENTATION_HORIZONTAL;
- range->adjustment = NULL;
- range->update_policy = GTK_UPDATE_CONTINUOUS;
- range->inverted = FALSE;
- range->flippable = FALSE;
- range->min_slider_size = 1;
- range->has_stepper_a = FALSE;
- range->has_stepper_b = FALSE;
- range->has_stepper_c = FALSE;
- range->has_stepper_d = FALSE;
- range->need_recalc = TRUE;
- range->round_digits = -1;
- range->layout = GTK_RANGE_GET_PRIVATE (range);
- range->layout->mouse_location = MOUSE_OUTSIDE;
- range->layout->mouse_x = -1;
- range->layout->mouse_y = -1;
- range->layout->grab_location = MOUSE_OUTSIDE;
- range->layout->grab_button = 0;
- range->layout->lower_sensitivity = GTK_SENSITIVITY_AUTO;
- range->layout->upper_sensitivity = GTK_SENSITIVITY_AUTO;
- range->layout->lower_sensitive = TRUE;
- range->layout->upper_sensitive = TRUE;
- range->layout->show_fill_level = FALSE;
- range->layout->restrict_to_fill_level = TRUE;
- range->layout->fill_level = G_MAXDOUBLE;
- range->timer = NULL;
+ priv->orientation = GTK_ORIENTATION_HORIZONTAL;
+ priv->adjustment = NULL;
+ priv->inverted = FALSE;
+ priv->flippable = FALSE;
+ priv->min_slider_size = 1;
+ priv->has_stepper_a = FALSE;
+ priv->has_stepper_b = FALSE;
+ priv->has_stepper_c = FALSE;
+ priv->has_stepper_d = FALSE;
+ priv->need_recalc = TRUE;
+ priv->round_digits = -1;
+ priv->mouse_location = MOUSE_OUTSIDE;
+ priv->mouse_x = -1;
+ priv->mouse_y = -1;
+ priv->grab_location = MOUSE_OUTSIDE;
+ priv->grab_button = 0;
+ priv->lower_sensitivity = GTK_SENSITIVITY_AUTO;
+ priv->upper_sensitivity = GTK_SENSITIVITY_AUTO;
+ priv->lower_sensitive = TRUE;
+ priv->upper_sensitive = TRUE;
+ priv->has_origin = FALSE;
+ priv->show_fill_level = FALSE;
+ priv->restrict_to_fill_level = TRUE;
+ priv->fill_level = G_MAXDOUBLE;
+ priv->timer = NULL;
}
/**
* The return value does not have a reference added, so should not
* be unreferenced.
*
- * Return value: a #GtkAdjustment
+ * Return value: (transfer none): a #GtkAdjustment
**/
GtkAdjustment*
gtk_range_get_adjustment (GtkRange *range)
{
- g_return_val_if_fail (GTK_IS_RANGE (range), NULL);
-
- if (!range->adjustment)
- gtk_range_set_adjustment (range, NULL);
+ GtkRangePrivate *priv;
- return range->adjustment;
-}
-
-/**
- * gtk_range_set_update_policy:
- * @range: a #GtkRange
- * @policy: update policy
- *
- * Sets the update policy for the range. #GTK_UPDATE_CONTINUOUS means that
- * anytime the range slider is moved, the range value will change and the
- * value_changed signal will be emitted. #GTK_UPDATE_DELAYED means that
- * the value will be updated after a brief timeout where no slider motion
- * occurs, so updates are spaced by a short time rather than
- * continuous. #GTK_UPDATE_DISCONTINUOUS means that the value will only
- * be updated when the user releases the button and ends the slider
- * drag operation.
- **/
-void
-gtk_range_set_update_policy (GtkRange *range,
- GtkUpdateType policy)
-{
- g_return_if_fail (GTK_IS_RANGE (range));
+ g_return_val_if_fail (GTK_IS_RANGE (range), NULL);
- if (range->update_policy != policy)
- {
- range->update_policy = policy;
- g_object_notify (G_OBJECT (range), "update-policy");
- }
-}
+ priv = range->priv;
-/**
- * gtk_range_get_update_policy:
- * @range: a #GtkRange
- *
- * Gets the update policy of @range. See gtk_range_set_update_policy().
- *
- * Return value: the current update policy
- **/
-GtkUpdateType
-gtk_range_get_update_policy (GtkRange *range)
-{
- g_return_val_if_fail (GTK_IS_RANGE (range), GTK_UPDATE_CONTINUOUS);
+ if (!priv->adjustment)
+ gtk_range_set_adjustment (range, NULL);
- return range->update_policy;
+ return priv->adjustment;
}
/**
gtk_range_set_adjustment (GtkRange *range,
GtkAdjustment *adjustment)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
-
+
+ priv = range->priv;
+
if (!adjustment)
- adjustment = (GtkAdjustment*) gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+ adjustment = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
else
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
- if (range->adjustment != adjustment)
+ if (priv->adjustment != adjustment)
{
- if (range->adjustment)
+ if (priv->adjustment)
{
- g_signal_handlers_disconnect_by_func (range->adjustment,
+ g_signal_handlers_disconnect_by_func (priv->adjustment,
gtk_range_adjustment_changed,
range);
- g_signal_handlers_disconnect_by_func (range->adjustment,
+ g_signal_handlers_disconnect_by_func (priv->adjustment,
gtk_range_adjustment_value_changed,
range);
- g_object_unref (range->adjustment);
+ g_object_unref (priv->adjustment);
}
- range->adjustment = adjustment;
+ priv->adjustment = adjustment;
g_object_ref_sink (adjustment);
g_signal_connect (adjustment, "changed",
gtk_range_set_inverted (GtkRange *range,
gboolean setting)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
-
+
+ priv = range->priv;
+
setting = setting != FALSE;
- if (setting != range->inverted)
+ if (setting != priv->inverted)
{
- range->inverted = setting;
+ priv->inverted = setting;
g_object_notify (G_OBJECT (range), "inverted");
gtk_widget_queue_resize (GTK_WIDGET (range));
}
{
g_return_val_if_fail (GTK_IS_RANGE (range), FALSE);
- return range->inverted;
+ return range->priv->inverted;
}
/**
gtk_range_set_flippable (GtkRange *range,
gboolean flippable)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
+ priv = range->priv;
+
flippable = flippable ? TRUE : FALSE;
- if (flippable != range->flippable)
+ if (flippable != priv->flippable)
{
- range->flippable = flippable;
+ priv->flippable = flippable;
gtk_widget_queue_draw (GTK_WIDGET (range));
}
{
g_return_val_if_fail (GTK_IS_RANGE (range), FALSE);
- return range->flippable;
+ return range->priv->flippable;
}
/**
* @size_fixed: %TRUE to make the slider size constant
*
* Sets whether the range's slider has a fixed size, or a size that
- * depends on it's adjustment's page size.
+ * depends on its adjustment's page size.
*
* This function is useful mainly for #GtkRange subclasses.
*
gtk_range_set_slider_size_fixed (GtkRange *range,
gboolean size_fixed)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
- if (size_fixed != range->slider_size_fixed)
+ priv = range->priv;
+
+ if (size_fixed != priv->slider_size_fixed)
{
- range->slider_size_fixed = size_fixed ? TRUE : FALSE;
+ priv->slider_size_fixed = size_fixed ? TRUE : FALSE;
- range->need_recalc = TRUE;
- gtk_range_calc_layout (range, range->adjustment->value);
- gtk_widget_queue_draw (GTK_WIDGET (range));
+ if (priv->adjustment && gtk_widget_get_mapped (GTK_WIDGET (range)))
+ {
+ priv->need_recalc = TRUE;
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
+ gtk_widget_queue_draw (GTK_WIDGET (range));
+ }
}
}
{
g_return_val_if_fail (GTK_IS_RANGE (range), FALSE);
- return range->slider_size_fixed;
+ return range->priv->slider_size_fixed;
}
/**
**/
void
gtk_range_set_min_slider_size (GtkRange *range,
- gboolean min_size)
+ gint min_size)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
g_return_if_fail (min_size > 0);
- if (min_size != range->min_slider_size)
+ priv = range->priv;
+
+ if (min_size != priv->min_slider_size)
{
- range->min_slider_size = min_size;
+ priv->min_slider_size = min_size;
- range->need_recalc = TRUE;
- gtk_range_calc_layout (range, range->adjustment->value);
- gtk_widget_queue_draw (GTK_WIDGET (range));
+ if (gtk_widget_is_drawable (GTK_WIDGET (range)))
+ {
+ priv->need_recalc = TRUE;
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
+ gtk_widget_queue_draw (GTK_WIDGET (range));
+ }
}
}
{
g_return_val_if_fail (GTK_IS_RANGE (range), FALSE);
- return range->min_slider_size;
+ return range->priv->min_slider_size;
}
/**
* gtk_range_get_range_rect:
* @range: a #GtkRange
- * @range_rect: return location for the range rectangle
+ * @range_rect: (out): return location for the range rectangle
*
* This function returns the area that contains the range's trough
* and its steppers, in widget->window coordinates.
gtk_range_get_range_rect (GtkRange *range,
GdkRectangle *range_rect)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
g_return_if_fail (range_rect != NULL);
- gtk_range_calc_layout (range, range->adjustment->value);
+ priv = range->priv;
- *range_rect = range->range_rect;
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
+
+ *range_rect = priv->range_rect;
}
/**
* gtk_range_get_slider_range:
* @range: a #GtkRange
- * @slider_start: (allow-none): return location for the slider's start, or %NULL
- * @slider_end: (allow-none): return location for the slider's end, or %NULL
+ * @slider_start: (out) (allow-none): return location for the slider's
+ * start, or %NULL
+ * @slider_end: (out) (allow-none): return location for the slider's
+ * end, or %NULL
*
* This function returns sliders range along the long dimension,
* in widget->window coordinates.
gint *slider_start,
gint *slider_end)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
- gtk_range_calc_layout (range, range->adjustment->value);
+ priv = range->priv;
+
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
if (slider_start)
- *slider_start = range->slider_start;
+ *slider_start = priv->slider_start;
if (slider_end)
- *slider_end = range->slider_end;
+ *slider_end = priv->slider_end;
}
/**
gtk_range_set_lower_stepper_sensitivity (GtkRange *range,
GtkSensitivityType sensitivity)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
- if (range->layout->lower_sensitivity != sensitivity)
+ priv = range->priv;
+
+ if (priv->lower_sensitivity != sensitivity)
{
- range->layout->lower_sensitivity = sensitivity;
+ priv->lower_sensitivity = sensitivity;
- range->need_recalc = TRUE;
- gtk_range_calc_layout (range, range->adjustment->value);
+ priv->need_recalc = TRUE;
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
gtk_widget_queue_draw (GTK_WIDGET (range));
g_object_notify (G_OBJECT (range), "lower-stepper-sensitivity");
{
g_return_val_if_fail (GTK_IS_RANGE (range), GTK_SENSITIVITY_AUTO);
- return range->layout->lower_sensitivity;
+ return range->priv->lower_sensitivity;
}
/**
gtk_range_set_upper_stepper_sensitivity (GtkRange *range,
GtkSensitivityType sensitivity)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
- if (range->layout->upper_sensitivity != sensitivity)
+ priv = range->priv;
+
+ if (priv->upper_sensitivity != sensitivity)
{
- range->layout->upper_sensitivity = sensitivity;
+ priv->upper_sensitivity = sensitivity;
- range->need_recalc = TRUE;
- gtk_range_calc_layout (range, range->adjustment->value);
+ priv->need_recalc = TRUE;
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
gtk_widget_queue_draw (GTK_WIDGET (range));
g_object_notify (G_OBJECT (range), "upper-stepper-sensitivity");
{
g_return_val_if_fail (GTK_IS_RANGE (range), GTK_SENSITIVITY_AUTO);
- return range->layout->upper_sensitivity;
+ return range->priv->upper_sensitivity;
}
/**
gdouble step,
gdouble page)
{
+ GtkAdjustment *adjustment;
+
g_return_if_fail (GTK_IS_RANGE (range));
- range->adjustment->step_increment = step;
- range->adjustment->page_increment = page;
+ adjustment = range->priv->adjustment;
- gtk_adjustment_changed (range->adjustment);
+ gtk_adjustment_configure (adjustment,
+ gtk_adjustment_get_value (adjustment),
+ gtk_adjustment_get_lower (adjustment),
+ gtk_adjustment_get_upper (adjustment),
+ step,
+ page,
+ gtk_adjustment_get_page_size (adjustment));
}
/**
gdouble min,
gdouble max)
{
+ GtkRangePrivate *priv;
+ GtkAdjustment *adjustment;
gdouble value;
g_return_if_fail (GTK_IS_RANGE (range));
- g_return_if_fail (min < max);
-
- range->adjustment->lower = min;
- range->adjustment->upper = max;
-
- value = range->adjustment->value;
-
- if (range->layout->restrict_to_fill_level)
- value = MIN (value, MAX (range->adjustment->lower,
- range->layout->fill_level));
-
- gtk_adjustment_set_value (range->adjustment, value);
- gtk_adjustment_changed (range->adjustment);
+ g_return_if_fail (min <= max);
+
+ priv = range->priv;
+ adjustment = priv->adjustment;
+
+ value = gtk_adjustment_get_value (adjustment);
+ if (priv->restrict_to_fill_level)
+ value = MIN (value, MAX (gtk_adjustment_get_lower (adjustment),
+ priv->fill_level));
+
+ gtk_adjustment_configure (adjustment,
+ value,
+ min,
+ max,
+ gtk_adjustment_get_step_increment (adjustment),
+ gtk_adjustment_get_page_increment (adjustment),
+ gtk_adjustment_get_page_size (adjustment));
}
/**
gtk_range_set_value (GtkRange *range,
gdouble value)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
- if (range->layout->restrict_to_fill_level)
- value = MIN (value, MAX (range->adjustment->lower,
- range->layout->fill_level));
+ priv = range->priv;
- gtk_adjustment_set_value (range->adjustment, value);
+ if (priv->restrict_to_fill_level)
+ value = MIN (value, MAX (gtk_adjustment_get_lower (priv->adjustment),
+ priv->fill_level));
+
+ gtk_adjustment_set_value (priv->adjustment, value);
}
/**
{
g_return_val_if_fail (GTK_IS_RANGE (range), 0.0);
- return range->adjustment->value;
+ return gtk_adjustment_get_value (range->priv->adjustment);
}
/**
gtk_range_set_show_fill_level (GtkRange *range,
gboolean show_fill_level)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
+ priv = range->priv;
+
show_fill_level = show_fill_level ? TRUE : FALSE;
- if (show_fill_level != range->layout->show_fill_level)
+ if (show_fill_level != priv->show_fill_level)
{
- range->layout->show_fill_level = show_fill_level;
+ priv->show_fill_level = show_fill_level;
g_object_notify (G_OBJECT (range), "show-fill-level");
gtk_widget_queue_draw (GTK_WIDGET (range));
}
{
g_return_val_if_fail (GTK_IS_RANGE (range), FALSE);
- return range->layout->show_fill_level;
+ return range->priv->show_fill_level;
}
/**
gtk_range_set_restrict_to_fill_level (GtkRange *range,
gboolean restrict_to_fill_level)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
+ priv = range->priv;
+
restrict_to_fill_level = restrict_to_fill_level ? TRUE : FALSE;
- if (restrict_to_fill_level != range->layout->restrict_to_fill_level)
+ if (restrict_to_fill_level != priv->restrict_to_fill_level)
{
- range->layout->restrict_to_fill_level = restrict_to_fill_level;
+ priv->restrict_to_fill_level = restrict_to_fill_level;
g_object_notify (G_OBJECT (range), "restrict-to-fill-level");
gtk_range_set_value (range, gtk_range_get_value (range));
{
g_return_val_if_fail (GTK_IS_RANGE (range), FALSE);
- return range->layout->restrict_to_fill_level;
+ return range->priv->restrict_to_fill_level;
}
/**
gtk_range_set_fill_level (GtkRange *range,
gdouble fill_level)
{
+ GtkRangePrivate *priv;
+
g_return_if_fail (GTK_IS_RANGE (range));
- if (fill_level != range->layout->fill_level)
+ priv = range->priv;
+
+ if (fill_level != priv->fill_level)
{
- range->layout->fill_level = fill_level;
+ priv->fill_level = fill_level;
g_object_notify (G_OBJECT (range), "fill-level");
- if (range->layout->show_fill_level)
+ if (priv->show_fill_level)
gtk_widget_queue_draw (GTK_WIDGET (range));
- if (range->layout->restrict_to_fill_level)
+ if (priv->restrict_to_fill_level)
gtk_range_set_value (range, gtk_range_get_value (range));
}
}
/**
* gtk_range_get_fill_level:
- * @range : A #GtkRange
+ * @range: A #GtkRange
*
* Gets the current position of the fill level indicator.
*
{
g_return_val_if_fail (GTK_IS_RANGE (range), 0.0);
- return range->layout->fill_level;
+ return range->priv->fill_level;
}
static gboolean
should_invert (GtkRange *range)
-{
- if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
+{
+ GtkRangePrivate *priv = range->priv;
+
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
return
- (range->inverted && !range->flippable) ||
- (range->inverted && range->flippable && gtk_widget_get_direction (GTK_WIDGET (range)) == GTK_TEXT_DIR_LTR) ||
- (!range->inverted && range->flippable && gtk_widget_get_direction (GTK_WIDGET (range)) == GTK_TEXT_DIR_RTL);
+ (priv->inverted && !priv->flippable) ||
+ (priv->inverted && priv->flippable && gtk_widget_get_direction (GTK_WIDGET (range)) == GTK_TEXT_DIR_LTR) ||
+ (!priv->inverted && priv->flippable && gtk_widget_get_direction (GTK_WIDGET (range)) == GTK_TEXT_DIR_RTL);
else
- return range->inverted;
+ return priv->inverted;
}
static void
-gtk_range_destroy (GtkObject *object)
+gtk_range_destroy (GtkWidget *widget)
{
- GtkRange *range = GTK_RANGE (object);
+ GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
gtk_range_remove_step_timer (range);
- gtk_range_remove_update_timer (range);
- if (range->layout->repaint_id)
- g_source_remove (range->layout->repaint_id);
- range->layout->repaint_id = 0;
-
- if (range->adjustment)
+ if (priv->adjustment)
{
- g_signal_handlers_disconnect_by_func (range->adjustment,
+ g_signal_handlers_disconnect_by_func (priv->adjustment,
gtk_range_adjustment_changed,
range);
- g_signal_handlers_disconnect_by_func (range->adjustment,
+ g_signal_handlers_disconnect_by_func (priv->adjustment,
gtk_range_adjustment_value_changed,
range);
- g_object_unref (range->adjustment);
- range->adjustment = NULL;
+ g_object_unref (priv->adjustment);
+ priv->adjustment = NULL;
}
- if (range->layout->n_marks)
+ if (priv->n_marks)
{
- g_free (range->layout->marks);
- range->layout->marks = NULL;
- g_free (range->layout->mark_pos);
- range->layout->mark_pos = NULL;
- range->layout->n_marks = 0;
+ g_free (priv->marks);
+ priv->marks = NULL;
+ g_free (priv->mark_pos);
+ priv->mark_pos = NULL;
+ priv->n_marks = 0;
}
- GTK_OBJECT_CLASS (gtk_range_parent_class)->destroy (object);
+ GTK_WIDGET_CLASS (gtk_range_parent_class)->destroy (widget);
}
static void
-gtk_range_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+gtk_range_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
GtkRange *range;
gint slider_width, stepper_size, focus_width, trough_border, stepper_spacing;
GdkRectangle range_rect;
GtkBorder border;
-
+
range = GTK_RANGE (widget);
-
+
gtk_range_get_props (range,
&slider_width, &stepper_size,
&focus_width, &trough_border,
&stepper_spacing, NULL,
NULL, NULL);
- gtk_range_calc_request (range,
+ gtk_range_calc_request (range,
slider_width, stepper_size,
focus_width, trough_border, stepper_spacing,
&range_rect, &border, NULL, NULL, NULL, NULL);
- requisition->width = range_rect.width + border.left + border.right;
- requisition->height = range_rect.height + border.top + border.bottom;
+ *minimum = *natural = range_rect.width + border.left + border.right;
}
static void
-gtk_range_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+gtk_range_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
GtkRange *range;
+ gint slider_width, stepper_size, focus_width, trough_border, stepper_spacing;
+ GdkRectangle range_rect;
+ GtkBorder border;
range = GTK_RANGE (widget);
- widget->allocation = *allocation;
-
- range->layout->recalc_marks = TRUE;
+ gtk_range_get_props (range,
+ &slider_width, &stepper_size,
+ &focus_width, &trough_border,
+ &stepper_spacing, NULL,
+ NULL, NULL);
- range->need_recalc = TRUE;
- gtk_range_calc_layout (range, range->adjustment->value);
+ gtk_range_calc_request (range,
+ slider_width, stepper_size,
+ focus_width, trough_border, stepper_spacing,
+ &range_rect, &border, NULL, NULL, NULL, NULL);
+
+ *minimum = *natural = range_rect.height + border.top + border.bottom;
+}
+
+static gboolean
+modify_allocation_for_window_grip (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
+ GtkWidget *window, *parent;
+ GdkRectangle grip_rect;
+ GdkRectangle translated_rect;
+ gint x;
+ gint y;
+
+ window = gtk_widget_get_toplevel (widget);
+ if (!GTK_IS_WINDOW (window))
+ return FALSE;
+
+ if (!gtk_window_resize_grip_is_visible (GTK_WINDOW (window)))
+ return FALSE;
+
+ /* Get the area of the window's corner grip */
+ gtk_window_get_resize_grip_area (GTK_WINDOW (window), &grip_rect);
+
+ x = 0;
+ y = 0;
+
+ /* Translate the stepper's area into window coords.
+ * This is slightly tricky. We can't just use
+ * gtk_widget_translate_coordinates (widget, window, 0, 0, &x, &y)
+ * since that translates wrt to the _current_ allocation
+ * and will lead to alternating between overlap and nonoverlap
+ * for successive allocations.
+ * Therefore, we find the window-widget to whose window allocation
+ * is relative, and translate from there upwards.
+ */
+ parent = widget;
+ while (gtk_widget_get_window (parent) == gtk_widget_get_window (widget) &&
+ parent != window)
+ {
+ parent = gtk_widget_get_parent (parent);
+ }
+
+ if (parent == window)
+ translated_rect = *allocation;
+ else
+ {
+ gtk_widget_translate_coordinates (parent,
+ window,
+ allocation->x, allocation->y,
+ &x, &y);
+ translated_rect.x = x;
+ translated_rect.y = y;
+ translated_rect.width = allocation->width;
+ translated_rect.height = allocation->height;
+ }
+
+ /* If the stepper button intersects the window resize grip.. */
+ if (gdk_rectangle_intersect (&grip_rect, &translated_rect, &grip_rect))
+ {
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ allocation->width -= grip_rect.width;
+ if (gtk_widget_get_direction (window) == GTK_TEXT_DIR_RTL)
+ allocation->x += grip_rect.width;
+ }
+ else
+ {
+ allocation->height -= grip_rect.height;
+ }
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+gtk_range_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
+
+ modify_allocation_for_window_grip (widget, allocation);
+ gtk_widget_set_allocation (widget, allocation);
+
+ priv->recalc_marks = TRUE;
+
+ priv->need_recalc = TRUE;
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
if (gtk_widget_get_realized (widget))
- gdk_window_move_resize (range->event_window,
- widget->allocation.x,
- widget->allocation.y,
- widget->allocation.width,
- widget->allocation.height);
+ gdk_window_move_resize (priv->event_window,
+ allocation->x, allocation->y,
+ allocation->width, allocation->height);
+}
+
+static void
+resize_grip_visible_changed (GObject *object,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ gtk_widget_queue_resize (GTK_WIDGET (user_data));
+}
+
+static void
+gtk_range_hierarchy_changed (GtkWidget *widget,
+ GtkWidget *previous_toplevel)
+{
+ GtkWidget *window;
+
+ if (previous_toplevel)
+ g_signal_handlers_disconnect_by_func (previous_toplevel,
+ G_CALLBACK (resize_grip_visible_changed),
+ widget);
+ window = gtk_widget_get_toplevel (widget);
+ if (gtk_widget_is_toplevel (window))
+ g_signal_connect (window, "notify::resize-grip-visible",
+ G_CALLBACK (resize_grip_visible_changed), widget);
}
static void
gtk_range_realize (GtkWidget *widget)
{
- GtkRange *range;
+ GtkAllocation allocation;
+ GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
+ GdkWindow *window;
GdkWindowAttr attributes;
- gint attributes_mask;
+ gint attributes_mask;
- range = GTK_RANGE (widget);
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
- gtk_range_calc_layout (range, range->adjustment->value);
-
gtk_widget_set_realized (widget, TRUE);
- widget->window = gtk_widget_get_parent_window (widget);
- g_object_ref (widget->window);
-
+ window = gtk_widget_get_parent_window (widget);
+ gtk_widget_set_window (widget, window);
+ g_object_ref (window);
+
+ gtk_widget_get_allocation (widget, &allocation);
+ if (modify_allocation_for_window_grip (widget, &allocation))
+ gtk_widget_set_allocation (widget, &allocation);
+
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.x = allocation.x;
+ attributes.y = allocation.y;
+ attributes.width = allocation.width;
+ attributes.height = allocation.height;
attributes.wclass = GDK_INPUT_ONLY;
attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_ENTER_NOTIFY_MASK |
- GDK_LEAVE_NOTIFY_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_SCROLL_MASK |
+ GDK_SMOOTH_SCROLL_MASK |
+ GDK_ENTER_NOTIFY_MASK |
+ GDK_LEAVE_NOTIFY_MASK |
GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK);
attributes_mask = GDK_WA_X | GDK_WA_Y;
- range->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
+ priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
- gdk_window_set_user_data (range->event_window, range);
-
- widget->style = gtk_style_attach (widget->style, widget->window);
+ gtk_widget_register_window (widget, priv->event_window);
}
static void
gtk_range_unrealize (GtkWidget *widget)
{
GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
gtk_range_remove_step_timer (range);
- gtk_range_remove_update_timer (range);
-
- gdk_window_set_user_data (range->event_window, NULL);
- gdk_window_destroy (range->event_window);
- range->event_window = NULL;
+
+ gtk_widget_unregister_window (widget, priv->event_window);
+ gdk_window_destroy (priv->event_window);
+ priv->event_window = NULL;
GTK_WIDGET_CLASS (gtk_range_parent_class)->unrealize (widget);
}
gtk_range_map (GtkWidget *widget)
{
GtkRange *range = GTK_RANGE (widget);
-
- gdk_window_show (range->event_window);
+ GtkRangePrivate *priv = range->priv;
+
+ gdk_window_show (priv->event_window);
GTK_WIDGET_CLASS (gtk_range_parent_class)->map (widget);
}
gtk_range_unmap (GtkWidget *widget)
{
GtkRange *range = GTK_RANGE (widget);
-
+ GtkRangePrivate *priv = range->priv;
+
stop_scrolling (range);
- gdk_window_hide (range->event_window);
+ gdk_window_hide (priv->event_window);
GTK_WIDGET_CLASS (gtk_range_parent_class)->unmap (widget);
}
-static const gchar *
-gtk_range_get_slider_detail (GtkRange *range)
+static void
+_gtk_range_update_context_for_stepper (GtkRange *range,
+ GtkStyleContext *context,
+ Stepper stepper)
{
- const gchar *slider_detail;
-
- if (range->layout->slider_detail_quark)
- return g_quark_to_string (range->layout->slider_detail_quark);
-
- slider_detail = GTK_RANGE_GET_CLASS (range)->slider_detail;
-
- if (slider_detail && slider_detail[0] == 'X')
- {
- gchar *detail = g_strdup (slider_detail);
-
- detail[0] = range->orientation == GTK_ORIENTATION_HORIZONTAL ? 'h' : 'v';
-
- range->layout->slider_detail_quark = g_quark_from_string (detail);
-
- g_free (detail);
-
- return g_quark_to_string (range->layout->slider_detail_quark);
- }
+ GtkRangePrivate *priv = range->priv;
+ GtkJunctionSides sides = 0;
+ gboolean vertical, is_rtl;
- return slider_detail;
-}
+ vertical = (priv->orientation == GTK_ORIENTATION_VERTICAL);
+ is_rtl = (gtk_widget_get_direction (GTK_WIDGET (range)) == GTK_TEXT_DIR_RTL);
-static const gchar *
-gtk_range_get_stepper_detail (GtkRange *range)
-{
- const gchar *stepper_detail;
-
- if (range->layout->stepper_detail_quark)
- return g_quark_to_string (range->layout->stepper_detail_quark);
+ /* Take junction sides from what's been
+ * previously set to the widget itself
+ */
+ sides = gtk_style_context_get_junction_sides (context);
- stepper_detail = GTK_RANGE_GET_CLASS (range)->stepper_detail;
+ if (vertical)
+ sides &= ~(GTK_JUNCTION_TOP | GTK_JUNCTION_BOTTOM);
+ else
+ sides &= ~(GTK_JUNCTION_LEFT | GTK_JUNCTION_RIGHT);
- if (stepper_detail && stepper_detail[0] == 'X')
+ switch (stepper)
{
- gchar *detail = g_strdup (stepper_detail);
-
- detail[0] = range->orientation == GTK_ORIENTATION_HORIZONTAL ? 'h' : 'v';
-
- range->layout->stepper_detail_quark = g_quark_from_string (detail);
+ case STEPPER_A:
+ if (vertical)
+ sides |= GTK_JUNCTION_BOTTOM;
+ else
+ sides |= (is_rtl) ? GTK_JUNCTION_LEFT : GTK_JUNCTION_RIGHT;
+ break;
+ case STEPPER_B:
+ if (priv->has_stepper_a)
+ {
+ if (vertical)
+ sides |= GTK_JUNCTION_TOP;
+ else
+ sides |= (is_rtl) ? GTK_JUNCTION_RIGHT : GTK_JUNCTION_LEFT;
+ }
- g_free (detail);
+ if (vertical)
+ sides |= GTK_JUNCTION_BOTTOM;
+ else
+ sides |= (is_rtl) ? GTK_JUNCTION_LEFT : GTK_JUNCTION_RIGHT;
+ break;
+ case STEPPER_C:
+ if (priv->has_stepper_d)
+ {
+ if (vertical)
+ sides |= GTK_JUNCTION_BOTTOM;
+ else
+ sides |= (is_rtl) ? GTK_JUNCTION_LEFT : GTK_JUNCTION_RIGHT;
+ }
- return g_quark_to_string (range->layout->stepper_detail_quark);
+ if (vertical)
+ sides |= GTK_JUNCTION_TOP;
+ else
+ sides |= (is_rtl) ? GTK_JUNCTION_RIGHT : GTK_JUNCTION_LEFT;
+ break;
+ case STEPPER_D:
+ if (vertical)
+ sides |= GTK_JUNCTION_TOP;
+ else
+ sides |= (is_rtl) ? GTK_JUNCTION_RIGHT : GTK_JUNCTION_LEFT;
+ break;
}
- return stepper_detail;
+ gtk_style_context_set_junction_sides (context, sides);
}
static void
draw_stepper (GtkRange *range,
- GdkRectangle *rect,
+ Stepper stepper,
+ cairo_t *cr,
GtkArrowType arrow_type,
gboolean clicked,
gboolean prelighted,
- GdkRectangle *area)
+ GtkStateFlags state)
{
- GtkStateType state_type;
- GtkShadowType shadow_type;
- GdkRectangle intersection;
+ GtkRangePrivate *priv = range->priv;
+ GtkAllocation allocation;
+ GtkStyleContext *context;
GtkWidget *widget = GTK_WIDGET (range);
gfloat arrow_scaling;
+ GdkRectangle *rect;
+ gdouble arrow_x;
+ gdouble arrow_y;
+ gdouble arrow_size, angle;
+ gboolean arrow_sensitive;
- gint arrow_x;
- gint arrow_y;
- gint arrow_width;
- gint arrow_height;
-
- gboolean arrow_sensitive = TRUE;
+ switch (stepper)
+ {
+ case STEPPER_A:
+ rect = &priv->stepper_a;
+ break;
+ case STEPPER_B:
+ rect = &priv->stepper_b;
+ break;
+ case STEPPER_C:
+ rect = &priv->stepper_c;
+ break;
+ case STEPPER_D:
+ rect = &priv->stepper_d;
+ break;
+ default:
+ g_assert_not_reached ();
+ };
- /* More to get the right clip region than for efficiency */
- if (!gdk_rectangle_intersect (area, rect, &intersection))
- return;
+ arrow_sensitive = TRUE;
- intersection.x += widget->allocation.x;
- intersection.y += widget->allocation.y;
+ gtk_widget_get_allocation (widget, &allocation);
- if ((!range->inverted && (arrow_type == GTK_ARROW_DOWN ||
+ if ((!priv->inverted && (arrow_type == GTK_ARROW_DOWN ||
arrow_type == GTK_ARROW_RIGHT)) ||
- (range->inverted && (arrow_type == GTK_ARROW_UP ||
+ (priv->inverted && (arrow_type == GTK_ARROW_UP ||
arrow_type == GTK_ARROW_LEFT)))
{
- arrow_sensitive = range->layout->upper_sensitive;
+ arrow_sensitive = priv->upper_sensitive;
}
else
{
- arrow_sensitive = range->layout->lower_sensitive;
+ arrow_sensitive = priv->lower_sensitive;
}
- if (!gtk_widget_is_sensitive (GTK_WIDGET (range)) || !arrow_sensitive)
- state_type = GTK_STATE_INSENSITIVE;
- else if (clicked)
- state_type = GTK_STATE_ACTIVE;
- else if (prelighted)
- state_type = GTK_STATE_PRELIGHT;
- else
- state_type = GTK_STATE_NORMAL;
+ state &= ~(GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT);
- if (clicked && arrow_sensitive)
- shadow_type = GTK_SHADOW_IN;
+ if ((state & GTK_STATE_FLAG_INSENSITIVE) || !arrow_sensitive)
+ {
+ state |= GTK_STATE_FLAG_INSENSITIVE;
+ }
+ else
+ {
+ if (clicked)
+ state |= GTK_STATE_FLAG_ACTIVE;
+ if (prelighted)
+ state |= GTK_STATE_FLAG_PRELIGHT;
+ }
+
+ context = gtk_widget_get_style_context (widget);
+
+ gtk_style_context_save (context);
+
+ /* don't set juction sides on scrollbar steppers */
+ if (gtk_style_context_has_class (context, GTK_STYLE_CLASS_SCROLLBAR))
+ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_NONE);
else
- shadow_type = GTK_SHADOW_OUT;
-
- gtk_paint_box (widget->style,
- widget->window,
- state_type, shadow_type,
- &intersection, widget,
- gtk_range_get_stepper_detail (range),
- widget->allocation.x + rect->x,
- widget->allocation.y + rect->y,
- rect->width,
- rect->height);
+ _gtk_range_update_context_for_stepper (range, context, stepper);
+
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+ gtk_style_context_set_state (context, state);
+
+ switch (arrow_type)
+ {
+ case GTK_ARROW_RIGHT:
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_RIGHT);
+ break;
+ case GTK_ARROW_DOWN:
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_BOTTOM);
+ break;
+ case GTK_ARROW_LEFT:
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_LEFT);
+ break;
+ case GTK_ARROW_UP:
+ default:
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOP);
+ break;
+ }
+
+ gtk_render_background (context, cr,
+ rect->x, rect->y,
+ rect->width, rect->height);
+ gtk_render_frame (context, cr,
+ rect->x, rect->y,
+ rect->width, rect->height);
gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
- arrow_width = rect->width * arrow_scaling;
- arrow_height = rect->height * arrow_scaling;
- arrow_x = widget->allocation.x + rect->x + (rect->width - arrow_width) / 2;
- arrow_y = widget->allocation.y + rect->y + (rect->height - arrow_height) / 2;
+ arrow_size = MIN (rect->width, rect->height) * arrow_scaling;
+ arrow_x = rect->x + (rect->width - arrow_size) / 2;
+ arrow_y = rect->y + (rect->height - arrow_size) / 2;
if (clicked && arrow_sensitive)
{
gtk_range_get_props (GTK_RANGE (widget),
NULL, NULL, NULL, NULL, NULL, NULL,
- &arrow_displacement_x, &arrow_displacement_y);
-
+ &arrow_displacement_x, &arrow_displacement_y);
+
arrow_x += arrow_displacement_x;
arrow_y += arrow_displacement_y;
}
-
- gtk_paint_arrow (widget->style,
- widget->window,
- state_type, shadow_type,
- &intersection, widget,
- gtk_range_get_stepper_detail (range),
- arrow_type,
- TRUE,
- arrow_x, arrow_y, arrow_width, arrow_height);
+
+ switch (arrow_type)
+ {
+ case GTK_ARROW_RIGHT:
+ angle = G_PI / 2;
+ break;
+ case GTK_ARROW_DOWN:
+ angle = G_PI;
+ break;
+ case GTK_ARROW_LEFT:
+ angle = 3 * (G_PI / 2);
+ break;
+ case GTK_ARROW_UP:
+ default:
+ angle = 0;
+ break;
+ }
+
+ gtk_render_arrow (context, cr,
+ angle,
+ arrow_x, arrow_y,
+ arrow_size);
+
+ gtk_style_context_restore (context);
}
static gboolean
-gtk_range_expose (GtkWidget *widget,
- GdkEventExpose *event)
+gtk_range_draw (GtkWidget *widget,
+ cairo_t *cr)
{
GtkRange *range = GTK_RANGE (widget);
- gboolean sensitive;
- GtkStateType state;
- GtkShadowType shadow_type;
- GdkRectangle expose_area; /* Relative to widget->allocation */
- GdkRectangle area;
+ GtkRangePrivate *priv = range->priv;
+ GtkStateFlags widget_state;
gint focus_line_width = 0;
gint focus_padding = 0;
- gboolean touchscreen;
+ gboolean draw_trough = TRUE;
+ gboolean draw_slider = TRUE;
+ GtkStyleContext *context;
+ GtkBorder margin;
+
+ context = gtk_widget_get_style_context (widget);
+
+ if (GTK_IS_SCALE (widget) &&
+ gtk_adjustment_get_upper (priv->adjustment) == gtk_adjustment_get_lower (priv->adjustment))
+ {
+ draw_trough = TRUE;
+ draw_slider = FALSE;
+ }
+ if (GTK_IS_COLOR_SCALE (widget))
+ {
+ draw_trough = FALSE;
+ draw_slider = TRUE;
+ }
- g_object_get (gtk_widget_get_settings (widget),
- "gtk-touchscreen-mode", &touchscreen,
- NULL);
if (gtk_widget_get_can_focus (GTK_WIDGET (range)))
gtk_widget_style_get (GTK_WIDGET (range),
"focus-line-width", &focus_line_width,
"focus-padding", &focus_padding,
NULL);
- /* we're now exposing, so there's no need to force early repaints */
- if (range->layout->repaint_id)
- g_source_remove (range->layout->repaint_id);
- range->layout->repaint_id = 0;
-
- expose_area = event->area;
- expose_area.x -= widget->allocation.x;
- expose_area.y -= widget->allocation.y;
-
gtk_range_calc_marks (range);
- gtk_range_calc_layout (range, range->adjustment->value);
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
- sensitive = gtk_widget_is_sensitive (widget);
+ widget_state = gtk_widget_get_state_flags (widget);
/* Just to be confusing, we draw the trough for the whole
* range rectangle, not the trough rectangle (the trough
* rectangle is just for hit detection)
*/
- /* The gdk_rectangle_intersect is more to get the right
- * clip region (limited to range_rect) than for efficiency
- */
- if (gdk_rectangle_intersect (&expose_area, &range->range_rect,
- &area))
+ cairo_save (cr);
+ gdk_cairo_rectangle (cr, &priv->range_rect);
+ cairo_clip (cr);
+
{
- gint x = (widget->allocation.x + range->range_rect.x +
+ gint x = (priv->range_rect.x +
focus_line_width + focus_padding);
- gint y = (widget->allocation.y + range->range_rect.y +
+ gint y = (priv->range_rect.y +
focus_line_width + focus_padding);
- gint width = (range->range_rect.width -
+ gint width = (priv->range_rect.width -
2 * (focus_line_width + focus_padding));
- gint height = (range->range_rect.height -
+ gint height = (priv->range_rect.height -
2 * (focus_line_width + focus_padding));
- gboolean trough_side_details;
gboolean trough_under_steppers;
gint stepper_size;
gint stepper_spacing;
- area.x += widget->allocation.x;
- area.y += widget->allocation.y;
-
gtk_widget_style_get (GTK_WIDGET (range),
- "trough-side-details", &trough_side_details,
"trough-under-steppers", &trough_under_steppers,
"stepper-size", &stepper_size,
"stepper-spacing", &stepper_spacing,
NULL);
- if (stepper_spacing > 0)
- trough_under_steppers = FALSE;
-
- if (! trough_under_steppers)
+ if (!trough_under_steppers)
{
gint offset = 0;
gint shorter = 0;
- if (range->has_stepper_a)
+ if (priv->has_stepper_a)
offset += stepper_size;
- if (range->has_stepper_b)
+ if (priv->has_stepper_b)
offset += stepper_size;
shorter += offset;
- if (range->has_stepper_c)
+ if (priv->has_stepper_c)
shorter += stepper_size;
- if (range->has_stepper_d)
+ if (priv->has_stepper_d)
shorter += stepper_size;
- if (range->has_stepper_a || range->has_stepper_b)
+ if (priv->has_stepper_a || priv->has_stepper_b)
{
offset += stepper_spacing;
shorter += stepper_spacing;
}
- if (range->has_stepper_c || range->has_stepper_d)
+ if (priv->has_stepper_c || priv->has_stepper_d)
{
shorter += stepper_spacing;
}
- if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
x += offset;
width -= shorter;
y += offset;
height -= shorter;
}
- }
-
- if (! trough_side_details)
- {
- gtk_paint_box (widget->style,
- widget->window,
- sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
- GTK_SHADOW_IN,
- &area, GTK_WIDGET(range), "trough",
- x, y,
- width, height);
}
- else
+
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_TROUGH);
+ gtk_style_context_get_margin (context, widget_state, &margin);
+
+ x += margin.left;
+ y += margin.top;
+ width -= margin.left + margin.right;
+ height -= margin.top + margin.bottom;
+
+ if (draw_trough)
{
- gint trough_change_pos_x = width;
- gint trough_change_pos_y = height;
-
- if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
- trough_change_pos_x = (range->layout->slider.x +
- range->layout->slider.width / 2 -
- (x - widget->allocation.x));
- else
- trough_change_pos_y = (range->layout->slider.y +
- range->layout->slider.height / 2 -
- (y - widget->allocation.y));
-
- gtk_paint_box (widget->style,
- widget->window,
- sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
- GTK_SHADOW_IN,
- &area, GTK_WIDGET (range),
- should_invert (range) ? "trough-upper" : "trough-lower",
- x, y,
- trough_change_pos_x, trough_change_pos_y);
-
- if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
- trough_change_pos_y = 0;
- else
- trough_change_pos_x = 0;
-
- gtk_paint_box (widget->style,
- widget->window,
- sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
- GTK_SHADOW_IN,
- &area, GTK_WIDGET (range),
- should_invert (range) ? "trough-lower" : "trough-upper",
- x + trough_change_pos_x, y + trough_change_pos_y,
- width - trough_change_pos_x,
- height - trough_change_pos_y);
+ if (!priv->has_origin || !draw_slider)
+ {
+ gtk_render_background (context, cr,
+ x, y, width, height);
+
+ gtk_render_frame (context, cr,
+ x, y, width, height);
+ }
+ else
+ {
+ gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
+
+ gint trough_change_pos_x = width;
+ gint trough_change_pos_y = height;
+
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ trough_change_pos_x = (priv->slider.x +
+ priv->slider.width / 2 -
+ x);
+ else
+ trough_change_pos_y = (priv->slider.y +
+ priv->slider.height / 2 -
+ y);
+
+ gtk_style_context_save (context);
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_LEFT);
+
+ if (!is_rtl)
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_HIGHLIGHT);
+ }
+ else
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOP);
+
+ gtk_render_background (context, cr, x, y,
+ trough_change_pos_x,
+ trough_change_pos_y);
+
+ gtk_render_frame (context, cr, x, y,
+ trough_change_pos_x,
+ trough_change_pos_y);
+
+ gtk_style_context_restore (context);
+
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ trough_change_pos_y = 0;
+ else
+ trough_change_pos_x = 0;
+
+ gtk_style_context_save (context);
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_RIGHT);
+
+ if (is_rtl)
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_HIGHLIGHT);
+ }
+ else
+ {
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_BOTTOM);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_HIGHLIGHT);
+ }
+
+ gtk_render_background (context, cr,
+ x + trough_change_pos_x, y + trough_change_pos_y,
+ width - trough_change_pos_x,
+ height - trough_change_pos_y);
+
+ gtk_render_frame (context, cr,
+ x + trough_change_pos_x, y + trough_change_pos_y,
+ width - trough_change_pos_x,
+ height - trough_change_pos_y);
+
+ gtk_style_context_restore (context);
+ }
}
- if (range->layout->show_fill_level &&
- range->adjustment->upper - range->adjustment->page_size -
- range->adjustment->lower != 0)
- {
- gdouble fill_level = range->layout->fill_level;
- gint fill_x = x;
- gint fill_y = y;
- gint fill_width = width;
- gint fill_height = height;
- gchar *fill_detail;
-
- fill_level = CLAMP (fill_level, range->adjustment->lower,
- range->adjustment->upper -
- range->adjustment->page_size);
-
- if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
- {
- fill_x = widget->allocation.x + range->layout->trough.x;
- fill_width = (range->layout->slider.width +
- (fill_level - range->adjustment->lower) /
- (range->adjustment->upper -
- range->adjustment->lower -
- range->adjustment->page_size) *
- (range->layout->trough.width -
- range->layout->slider.width));
+ gtk_style_context_restore (context);
- if (should_invert (range))
- fill_x += range->layout->trough.width - fill_width;
- }
- else
- {
- fill_y = widget->allocation.y + range->layout->trough.y;
- fill_height = (range->layout->slider.height +
- (fill_level - range->adjustment->lower) /
- (range->adjustment->upper -
- range->adjustment->lower -
- range->adjustment->page_size) *
- (range->layout->trough.height -
- range->layout->slider.height));
+ if (priv->show_fill_level &&
+ gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment) -
+ gtk_adjustment_get_lower (priv->adjustment) != 0)
+ {
+ gdouble fill_level = priv->fill_level;
+ gint fill_x = x;
+ gint fill_y = y;
+ gint fill_width = width;
+ gint fill_height = height;
- if (should_invert (range))
- fill_y += range->layout->trough.height - fill_height;
- }
-
- if (fill_level < range->adjustment->upper - range->adjustment->page_size)
- fill_detail = "trough-fill-level-full";
- else
- fill_detail = "trough-fill-level";
-
- gtk_paint_box (widget->style,
- widget->window,
- sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
- GTK_SHADOW_OUT,
- &area, GTK_WIDGET (range), fill_detail,
- fill_x, fill_y,
- fill_width, fill_height);
- }
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_PROGRESSBAR);
- if (sensitive && gtk_widget_has_focus (widget))
- gtk_paint_focus (widget->style, widget->window, gtk_widget_get_state (widget),
- &area, widget, "trough",
- widget->allocation.x + range->range_rect.x,
- widget->allocation.y + range->range_rect.y,
- range->range_rect.width,
- range->range_rect.height);
- }
+ fill_level = CLAMP (fill_level, gtk_adjustment_get_lower (priv->adjustment),
+ gtk_adjustment_get_upper (priv->adjustment) -
+ gtk_adjustment_get_page_size (priv->adjustment));
- shadow_type = GTK_SHADOW_OUT;
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ fill_x = priv->trough.x;
+ fill_width = (priv->slider.width +
+ (fill_level - gtk_adjustment_get_lower (priv->adjustment)) /
+ (gtk_adjustment_get_upper (priv->adjustment) -
+ gtk_adjustment_get_lower (priv->adjustment) -
+ gtk_adjustment_get_page_size (priv->adjustment)) *
+ (priv->trough.width -
+ priv->slider.width));
- if (!sensitive)
- state = GTK_STATE_INSENSITIVE;
- else if (!touchscreen && range->layout->mouse_location == MOUSE_SLIDER)
- state = GTK_STATE_PRELIGHT;
- else
- state = GTK_STATE_NORMAL;
+ if (should_invert (range))
+ fill_x += priv->trough.width - fill_width;
+ }
+ else
+ {
+ fill_y = priv->trough.y;
+ fill_height = (priv->slider.height +
+ (fill_level - gtk_adjustment_get_lower (priv->adjustment)) /
+ (gtk_adjustment_get_upper (priv->adjustment) -
+ gtk_adjustment_get_lower (priv->adjustment) -
+ gtk_adjustment_get_page_size (priv->adjustment)) *
+ (priv->trough.height -
+ priv->slider.height));
- if (range->layout->grab_location == MOUSE_SLIDER)
- {
- gboolean activate_slider;
+ if (should_invert (range))
+ fill_y += priv->trough.height - fill_height;
+ }
- gtk_widget_style_get (widget, "activate-slider", &activate_slider, NULL);
+ gtk_render_activity (context, cr,
+ fill_x, fill_y,
+ fill_width, fill_height);
+
+ gtk_style_context_restore (context);
+ }
- if (activate_slider)
+ if (!(widget_state & GTK_STATE_FLAG_INSENSITIVE) && gtk_widget_has_visible_focus (widget))
{
- state = GTK_STATE_ACTIVE;
- shadow_type = GTK_SHADOW_IN;
+ gtk_render_focus (context, cr,
+ priv->range_rect.x,
+ priv->range_rect.y,
+ priv->range_rect.width,
+ priv->range_rect.height);
}
}
- if (gdk_rectangle_intersect (&expose_area,
- &range->layout->slider,
- &area))
+ cairo_restore (cr);
+
+ if (draw_slider)
{
- area.x += widget->allocation.x;
- area.y += widget->allocation.y;
-
- gtk_paint_slider (widget->style,
- widget->window,
- state,
- shadow_type,
- &area,
- widget,
- gtk_range_get_slider_detail (range),
- widget->allocation.x + range->layout->slider.x,
- widget->allocation.y + range->layout->slider.y,
- range->layout->slider.width,
- range->layout->slider.height,
- range->orientation);
+ GtkStateFlags state = widget_state;
+
+ state &= ~(GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_ACTIVE);
+
+ if (priv->mouse_location == MOUSE_SLIDER && !(state & GTK_STATE_FLAG_INSENSITIVE))
+ state |= GTK_STATE_FLAG_PRELIGHT;
+
+ if (priv->grab_location == MOUSE_SLIDER)
+ state |= GTK_STATE_FLAG_ACTIVE;
+
+ cairo_save (cr);
+ gdk_cairo_rectangle (cr, &priv->slider);
+ cairo_clip (cr);
+
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
+ gtk_style_context_set_state (context, state);
+
+ gtk_render_slider (context, cr,
+ priv->slider.x,
+ priv->slider.y,
+ priv->slider.width,
+ priv->slider.height,
+ priv->orientation);
+
+ gtk_style_context_restore (context);
+
+ cairo_restore (cr);
}
-
- if (range->has_stepper_a)
- draw_stepper (range, &range->layout->stepper_a,
- range->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_UP : GTK_ARROW_LEFT,
- range->layout->grab_location == MOUSE_STEPPER_A,
- !touchscreen && range->layout->mouse_location == MOUSE_STEPPER_A,
- &expose_area);
-
- if (range->has_stepper_b)
- draw_stepper (range, &range->layout->stepper_b,
- range->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT,
- range->layout->grab_location == MOUSE_STEPPER_B,
- !touchscreen && range->layout->mouse_location == MOUSE_STEPPER_B,
- &expose_area);
-
- if (range->has_stepper_c)
- draw_stepper (range, &range->layout->stepper_c,
- range->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_UP : GTK_ARROW_LEFT,
- range->layout->grab_location == MOUSE_STEPPER_C,
- !touchscreen && range->layout->mouse_location == MOUSE_STEPPER_C,
- &expose_area);
-
- if (range->has_stepper_d)
- draw_stepper (range, &range->layout->stepper_d,
- range->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT,
- range->layout->grab_location == MOUSE_STEPPER_D,
- !touchscreen && range->layout->mouse_location == MOUSE_STEPPER_D,
- &expose_area);
-
+
+ if (priv->has_stepper_a)
+ draw_stepper (range, STEPPER_A, cr,
+ priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_UP : GTK_ARROW_LEFT,
+ priv->grab_location == MOUSE_STEPPER_A,
+ priv->mouse_location == MOUSE_STEPPER_A,
+ widget_state);
+
+ if (priv->has_stepper_b)
+ draw_stepper (range, STEPPER_B, cr,
+ priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT,
+ priv->grab_location == MOUSE_STEPPER_B,
+ priv->mouse_location == MOUSE_STEPPER_B,
+ widget_state);
+
+ if (priv->has_stepper_c)
+ draw_stepper (range, STEPPER_C, cr,
+ priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_UP : GTK_ARROW_LEFT,
+ priv->grab_location == MOUSE_STEPPER_C,
+ priv->mouse_location == MOUSE_STEPPER_C,
+ widget_state);
+
+ if (priv->has_stepper_d)
+ draw_stepper (range, STEPPER_D, cr,
+ priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT,
+ priv->grab_location == MOUSE_STEPPER_D,
+ priv->mouse_location == MOUSE_STEPPER_D,
+ widget_state);
+
return FALSE;
}
MouseLocation location,
gint button)
{
- GtkRangeLayout *layout = range->layout;
+ GtkRangePrivate *priv = range->priv;
- if (device == layout->grab_device)
+ if (device == priv->grab_device)
return;
- if (layout->grab_device != NULL)
- {
- g_warning ("GtkRange already had a grab device, releasing device grab");
- gtk_device_grab_remove (GTK_WIDGET (range), layout->grab_device);
- }
-
- /* we don't actually gdk_grab, since a button is down */
- gtk_device_grab_add (GTK_WIDGET (range), device, TRUE);
-
- range->layout->grab_location = location;
- range->layout->grab_button = button;
- range->layout->grab_device = device;
+ /* Don't perform any GDK/GTK+ grab here. Since a button
+ * is down, there's an ongoing implicit grab on
+ * priv->event_window, which pretty much guarantees this
+ * is the only widget receiving the pointer events.
+ */
+ priv->grab_location = location;
+ priv->grab_button = button;
+ priv->grab_device = device;
if (gtk_range_update_mouse_location (range))
gtk_widget_queue_draw (GTK_WIDGET (range));
static void
range_grab_remove (GtkRange *range)
{
- GtkRangeLayout *layout = range->layout;
+ GtkRangePrivate *priv = range->priv;
MouseLocation location;
- if (layout->grab_device)
+ if (priv->grab_device)
{
- gtk_device_grab_remove (GTK_WIDGET (range),
- layout->grab_device);
- layout->grab_device = NULL;
+ GdkDevice *grab_device = priv->grab_device;
+
+ priv->grab_device = NULL;
+ gtk_device_grab_remove (GTK_WIDGET (range), grab_device);
}
- location = range->layout->grab_location;
- range->layout->grab_location = MOUSE_OUTSIDE;
- range->layout->grab_button = 0;
+ location = priv->grab_location;
+ priv->grab_location = MOUSE_OUTSIDE;
+ priv->grab_button = 0;
if (gtk_range_update_mouse_location (range) ||
location != MOUSE_OUTSIDE)
gtk_widget_queue_draw (GTK_WIDGET (range));
+
+ priv->zoom = FALSE;
}
static GtkScrollType
range_get_scroll_for_grab (GtkRange *range)
-{
+{
+ GtkRangePrivate *priv = range->priv;
gboolean invert;
invert = should_invert (range);
- switch (range->layout->grab_location)
+ switch (priv->grab_location)
{
/* Backward stepper */
case MOUSE_STEPPER_A:
case MOUSE_STEPPER_C:
- switch (range->layout->grab_button)
+ switch (priv->grab_button)
{
- case 1:
+ case GDK_BUTTON_PRIMARY:
return invert ? GTK_SCROLL_STEP_FORWARD : GTK_SCROLL_STEP_BACKWARD;
break;
- case 2:
+ case GDK_BUTTON_MIDDLE:
return invert ? GTK_SCROLL_PAGE_FORWARD : GTK_SCROLL_PAGE_BACKWARD;
break;
- case 3:
+ case GDK_BUTTON_SECONDARY:
return invert ? GTK_SCROLL_END : GTK_SCROLL_START;
break;
}
/* Forward stepper */
case MOUSE_STEPPER_B:
case MOUSE_STEPPER_D:
- switch (range->layout->grab_button)
+ switch (priv->grab_button)
{
- case 1:
+ case GDK_BUTTON_PRIMARY:
return invert ? GTK_SCROLL_STEP_BACKWARD : GTK_SCROLL_STEP_FORWARD;
break;
- case 2:
+ case GDK_BUTTON_MIDDLE:
return invert ? GTK_SCROLL_PAGE_BACKWARD : GTK_SCROLL_PAGE_FORWARD;
break;
- case 3:
+ case GDK_BUTTON_SECONDARY:
return invert ? GTK_SCROLL_START : GTK_SCROLL_END;
break;
}
/* In the trough */
case MOUSE_TROUGH:
{
- if (range->trough_click_forward)
+ if (priv->trough_click_forward)
return GTK_SCROLL_PAGE_FORWARD;
else
return GTK_SCROLL_PAGE_BACKWARD;
static gdouble
coord_to_value (GtkRange *range,
- gint coord)
+ gdouble coord)
{
+ GtkRangePrivate *priv = range->priv;
gdouble frac;
gdouble value;
gint trough_length;
gint trough_border;
gint trough_under_steppers;
- if (range->orientation == GTK_ORIENTATION_VERTICAL)
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
{
- trough_length = range->layout->trough.height;
- trough_start = range->layout->trough.y;
- slider_length = range->layout->slider.height;
+ trough_length = priv->trough.height;
+ trough_start = priv->trough.y;
+ slider_length = priv->slider.height;
}
else
{
- trough_length = range->layout->trough.width;
- trough_start = range->layout->trough.x;
- slider_length = range->layout->slider.width;
+ trough_length = priv->trough.width;
+ trough_start = priv->trough.x;
+ slider_length = priv->slider.width;
}
gtk_range_get_props (range, NULL, NULL, NULL, &trough_border, NULL,
if (should_invert (range))
frac = 1.0 - frac;
- value = range->adjustment->lower + frac * (range->adjustment->upper -
- range->adjustment->lower -
- range->adjustment->page_size);
+ value = gtk_adjustment_get_lower (priv->adjustment) + frac * (gtk_adjustment_get_upper (priv->adjustment) -
+ gtk_adjustment_get_lower (priv->adjustment) -
+ gtk_adjustment_get_page_size (priv->adjustment));
return value;
}
{
GdkDevice *device;
GtkRange *range = GTK_RANGE (widget);
- GtkRangeLayout *layout = range->layout;
+ GtkRangePrivate *priv = range->priv;
device = gdk_event_get_device ((GdkEvent *) event);
device = gdk_device_get_associated_device (device);
- if (device == layout->grab_device &&
- event->keyval == GDK_Escape &&
- range->layout->grab_location != MOUSE_OUTSIDE)
+ if (device == priv->grab_device &&
+ event->keyval == GDK_KEY_Escape &&
+ priv->grab_location != MOUSE_OUTSIDE)
{
stop_scrolling (range);
update_slider_position (range,
- range->slide_initial_coordinate,
- range->slide_initial_coordinate);
+ priv->slide_initial_coordinate,
+ priv->slide_initial_coordinate);
return TRUE;
}
GdkEventButton *event)
{
GtkRange *range = GTK_RANGE (widget);
- GdkDevice *device;
-
+ GtkRangePrivate *priv = range->priv;
+ GdkDevice *device, *source_device;
+ GdkInputSource source;
+ gboolean primary_warps;
+ gint page_increment_button, warp_button;
+
if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
/* ignore presses when we're already doing something else. */
- if (range->layout->grab_location != MOUSE_OUTSIDE)
+ if (priv->grab_location != MOUSE_OUTSIDE)
return FALSE;
device = gdk_event_get_device ((GdkEvent *) event);
- range->layout->mouse_x = event->x;
- range->layout->mouse_y = event->y;
+ source_device = gdk_event_get_source_device ((GdkEvent *) event);
+ source = gdk_device_get_source (source_device);
+
+ priv->mouse_x = event->x;
+ priv->mouse_y = event->y;
if (gtk_range_update_mouse_location (range))
gtk_widget_queue_draw (widget);
-
- if (range->layout->mouse_location == MOUSE_TROUGH &&
- event->button == 1)
+
+ g_object_get (gtk_widget_get_settings (widget),
+ "gtk-primary-button-warps-slider", &primary_warps,
+ NULL);
+ if (primary_warps)
+ {
+ warp_button = GDK_BUTTON_PRIMARY;
+ page_increment_button = GDK_BUTTON_SECONDARY;
+ }
+ else
+ {
+ warp_button = GDK_BUTTON_MIDDLE;
+ page_increment_button = GDK_BUTTON_PRIMARY;
+ }
+
+ if (priv->mouse_location == MOUSE_SLIDER &&
+ gdk_event_triggers_context_menu ((GdkEvent *)event))
+ {
+ gboolean handled;
+
+ g_signal_emit_by_name (widget, "popup-menu", &handled);
+
+ return TRUE;
+ }
+
+ if (source != GDK_SOURCE_TOUCHSCREEN &&
+ priv->mouse_location == MOUSE_TROUGH &&
+ event->button == page_increment_button)
{
- /* button 1 steps by page increment, as with button 2 on a stepper
+ /* button 2 steps by page increment, as with button 2 on a stepper
*/
GtkScrollType scroll;
gdouble click_value;
-
+
click_value = coord_to_value (range,
- range->orientation == GTK_ORIENTATION_VERTICAL ?
+ priv->orientation == GTK_ORIENTATION_VERTICAL ?
event->y : event->x);
-
- range->trough_click_forward = click_value > range->adjustment->value;
+
+ priv->trough_click_forward = click_value > gtk_adjustment_get_value (priv->adjustment);
range_grab_add (range, device, MOUSE_TROUGH, event->button);
-
+
scroll = range_get_scroll_for_grab (range);
-
+
gtk_range_add_step_timer (range, scroll);
return TRUE;
}
- else if ((range->layout->mouse_location == MOUSE_STEPPER_A ||
- range->layout->mouse_location == MOUSE_STEPPER_B ||
- range->layout->mouse_location == MOUSE_STEPPER_C ||
- range->layout->mouse_location == MOUSE_STEPPER_D) &&
- (event->button == 1 || event->button == 2 || event->button == 3))
+ else if ((priv->mouse_location == MOUSE_STEPPER_A ||
+ priv->mouse_location == MOUSE_STEPPER_B ||
+ priv->mouse_location == MOUSE_STEPPER_C ||
+ priv->mouse_location == MOUSE_STEPPER_D) &&
+ (event->button == GDK_BUTTON_PRIMARY ||
+ event->button == GDK_BUTTON_MIDDLE ||
+ event->button == GDK_BUTTON_SECONDARY))
{
+ GtkAllocation allocation;
GdkRectangle *stepper_area;
GtkScrollType scroll;
-
- range_grab_add (range, device, range->layout->mouse_location, event->button);
- stepper_area = get_area (range, range->layout->mouse_location);
+ range_grab_add (range, device, priv->mouse_location, event->button);
+
+ gtk_widget_get_allocation (widget, &allocation);
+ stepper_area = get_area (range, priv->mouse_location);
+
gtk_widget_queue_draw_area (widget,
- widget->allocation.x + stepper_area->x,
- widget->allocation.y + stepper_area->y,
+ allocation.x + stepper_area->x,
+ allocation.y + stepper_area->y,
stepper_area->width,
stepper_area->height);
return TRUE;
}
- else if ((range->layout->mouse_location == MOUSE_TROUGH &&
- event->button == 2) ||
- range->layout->mouse_location == MOUSE_SLIDER)
+ else if ((priv->mouse_location == MOUSE_TROUGH &&
+ (source == GDK_SOURCE_TOUCHSCREEN ||
+ event->button == warp_button)) ||
+ priv->mouse_location == MOUSE_SLIDER)
{
gboolean need_value_update = FALSE;
- gboolean activate_slider;
/* Any button can be used to drag the slider, but you can start
- * dragging the slider with a trough click using button 2;
- * On button 2 press, we warp the slider to mouse position,
- * then begin the slider drag.
+ * dragging the slider with a trough click using button 1;
+ * we warp the slider to mouse position, then begin the slider drag.
*/
- if (event->button == 2)
+ if (priv->mouse_location != MOUSE_SLIDER)
{
gdouble slider_low_value, slider_high_value, new_value;
slider_high_value =
coord_to_value (range,
- range->orientation == GTK_ORIENTATION_VERTICAL ?
+ priv->orientation == GTK_ORIENTATION_VERTICAL ?
event->y : event->x);
slider_low_value =
coord_to_value (range,
- range->orientation == GTK_ORIENTATION_VERTICAL ?
- event->y - range->layout->slider.height :
- event->x - range->layout->slider.width);
-
+ priv->orientation == GTK_ORIENTATION_VERTICAL ?
+ event->y - priv->slider.height :
+ event->x - priv->slider.width);
+
/* compute new value for warped slider */
new_value = slider_low_value + (slider_high_value - slider_low_value) / 2;
/* recalc slider, so we can set slide_initial_slider_position
* properly
*/
- range->need_recalc = TRUE;
+ priv->need_recalc = TRUE;
gtk_range_calc_layout (range, new_value);
/* defer adjustment updates to update_slider_position() in order
*/
need_value_update = TRUE;
}
-
- if (range->orientation == GTK_ORIENTATION_VERTICAL)
+ else
+ {
+ /* Shift-click in the slider = fine adjustment */
+ if (event->state & GDK_SHIFT_MASK)
+ priv->zoom = TRUE;
+ }
+
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
{
- range->slide_initial_slider_position = range->layout->slider.y;
- range->slide_initial_coordinate = event->y;
+ priv->slide_initial_slider_position = priv->slider.y;
+ priv->slide_initial_coordinate = event->y;
}
else
{
- range->slide_initial_slider_position = range->layout->slider.x;
- range->slide_initial_coordinate = event->x;
+ priv->slide_initial_slider_position = priv->slider.x;
+ priv->slide_initial_coordinate = event->x;
}
range_grab_add (range, device, MOUSE_SLIDER, event->button);
- gtk_widget_style_get (widget, "activate-slider", &activate_slider, NULL);
-
- /* force a redraw, if the active slider is drawn differently to the
- * prelight one
- */
- if (activate_slider)
- gtk_widget_queue_draw (widget);
+ gtk_widget_queue_draw (widget);
if (need_value_update)
update_slider_position (range, event->x, event->y);
gint mouse_x,
gint mouse_y)
{
- gint delta;
- gint c;
+ GtkRangePrivate *priv = range->priv;
+ gdouble delta;
+ gdouble c;
gdouble new_value;
gboolean handled;
gdouble next_value;
gdouble mark_value;
gdouble mark_delta;
+ gdouble zoom;
gint i;
- if (range->orientation == GTK_ORIENTATION_VERTICAL)
- delta = mouse_y - range->slide_initial_coordinate;
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+ delta = mouse_y - priv->slide_initial_coordinate;
+ else
+ delta = mouse_x - priv->slide_initial_coordinate;
+
+ if (priv->zoom)
+ {
+ zoom = MIN(1.0, (priv->orientation == GTK_ORIENTATION_VERTICAL ?
+ priv->trough.height : priv->trough.width) /
+ (gtk_adjustment_get_upper (priv->adjustment) -
+ gtk_adjustment_get_lower (priv->adjustment) -
+ gtk_adjustment_get_page_size (priv->adjustment)));
+ /* the above is ineffective for scales, so just set a zoom factor */
+ if (zoom == 1.0)
+ zoom = 0.25;
+ }
else
- delta = mouse_x - range->slide_initial_coordinate;
+ zoom = 1.0;
- c = range->slide_initial_slider_position + delta;
+ c = priv->slide_initial_slider_position + zoom * delta;
new_value = coord_to_value (range, c);
next_value = coord_to_value (range, c + 1);
- mark_delta = fabs (next_value - new_value);
+ mark_delta = fabs (next_value - new_value);
- for (i = 0; i < range->layout->n_marks; i++)
+ for (i = 0; i < priv->n_marks; i++)
{
- mark_value = range->layout->marks[i];
+ mark_value = priv->marks[i];
- if (fabs (range->adjustment->value - mark_value) < 3 * mark_delta)
+ if (fabs (gtk_adjustment_get_value (priv->adjustment) - mark_value) < 3 * mark_delta)
{
- if (fabs (new_value - mark_value) < (range->slider_end - range->slider_start) * 0.5 * mark_delta)
+ if (fabs (new_value - mark_value) < (priv->slider_end - priv->slider_start) * 0.5 * mark_delta)
{
new_value = mark_value;
break;
}
}
- }
+ }
g_signal_emit (range, signals[CHANGE_VALUE], 0, GTK_SCROLL_JUMP, new_value,
&handled);
}
-static void
+static void
stop_scrolling (GtkRange *range)
{
range_grab_remove (range);
gtk_range_remove_step_timer (range);
- /* Flush any pending discontinuous/delayed updates */
- gtk_range_update_value (range);
}
static gboolean
GdkEventGrabBroken *event)
{
GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
GdkDevice *device;
device = gdk_event_get_device ((GdkEvent *) event);
- if (device == range->layout->grab_device &&
- range->layout->grab_location != MOUSE_OUTSIDE)
+ if (device == priv->grab_device &&
+ priv->grab_location != MOUSE_OUTSIDE)
{
- if (range->layout->grab_location == MOUSE_SLIDER)
- update_slider_position (range, range->layout->mouse_x, range->layout->mouse_y);
-
+ if (priv->grab_location == MOUSE_SLIDER)
+ update_slider_position (range, priv->mouse_x, priv->mouse_y);
+
stop_scrolling (range);
return TRUE;
GdkEventButton *event)
{
GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
GdkDevice *device;
- if (event->window == range->event_window)
+ if (event->window == priv->event_window)
{
- range->layout->mouse_x = event->x;
- range->layout->mouse_y = event->y;
+ priv->mouse_x = event->x;
+ priv->mouse_y = event->y;
}
else
{
- gdk_window_get_device_position (range->event_window,
+ gdk_window_get_device_position (priv->event_window,
event->device,
- &range->layout->mouse_x,
- &range->layout->mouse_y,
+ &priv->mouse_x,
+ &priv->mouse_y,
NULL);
}
device = gdk_event_get_device ((GdkEvent *) event);
- if (range->layout->grab_device == device &&
- range->layout->grab_button == event->button)
+ if (priv->grab_device == device &&
+ priv->grab_button == event->button)
{
- if (range->layout->grab_location == MOUSE_SLIDER)
- update_slider_position (range, range->layout->mouse_x, range->layout->mouse_y);
+ if (priv->grab_location == MOUSE_SLIDER)
+ update_slider_position (range, priv->mouse_x, priv->mouse_y);
stop_scrolling (range);
/**
* _gtk_range_get_wheel_delta:
* @range: a #GtkRange
- * @direction: A #GdkScrollDirection
- *
+ * @event: A #GdkEventScroll
+ *
* Returns a good step value for the mouse wheel.
- *
- * Return value: A good step value for the mouse wheel.
- *
+ *
+ * Return value: A good step value for the mouse wheel.
+ *
* Since: 2.4
**/
gdouble
-_gtk_range_get_wheel_delta (GtkRange *range,
- GdkScrollDirection direction)
+_gtk_range_get_wheel_delta (GtkRange *range,
+ GdkEventScroll *event)
{
- GtkAdjustment *adj = range->adjustment;
+ GtkRangePrivate *priv = range->priv;
+ GtkAdjustment *adjustment = priv->adjustment;
+ gdouble dx, dy;
gdouble delta;
+ gdouble page_size;
+ gdouble page_increment;
+ gdouble scroll_unit;
+
+ page_size = gtk_adjustment_get_page_size (adjustment);
+ page_increment = gtk_adjustment_get_page_increment (adjustment);
if (GTK_IS_SCROLLBAR (range))
- delta = pow (adj->page_size, 2.0 / 3.0);
+ scroll_unit = pow (page_size, 2.0 / 3.0);
else
- delta = adj->step_increment * 2;
-
- if (direction == GDK_SCROLL_UP ||
- direction == GDK_SCROLL_LEFT)
- delta = - delta;
-
- if (range->inverted)
+ scroll_unit = page_increment;
+
+ if (gdk_event_get_scroll_deltas ((GdkEvent *) event, &dx, &dy))
+ {
+ if (dx != 0 &&
+ gtk_orientable_get_orientation (GTK_ORIENTABLE (range)) == GTK_ORIENTATION_HORIZONTAL)
+ delta = dx * scroll_unit;
+ else
+ delta = dy * scroll_unit;
+ }
+ else
+ {
+ if (event->direction == GDK_SCROLL_UP ||
+ event->direction == GDK_SCROLL_LEFT)
+ delta = - scroll_unit;
+ else
+ delta = scroll_unit;
+ }
+
+ if (priv->inverted)
delta = - delta;
return delta;
}
-
+
static gboolean
gtk_range_scroll_event (GtkWidget *widget,
GdkEventScroll *event)
{
GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
if (gtk_widget_get_realized (widget))
{
- GtkAdjustment *adj = GTK_RANGE (range)->adjustment;
gdouble delta;
gboolean handled;
- delta = _gtk_range_get_wheel_delta (range, event->direction);
+ delta = _gtk_range_get_wheel_delta (range, event);
g_signal_emit (range, signals[CHANGE_VALUE], 0,
- GTK_SCROLL_JUMP, adj->value + delta,
+ GTK_SCROLL_JUMP, gtk_adjustment_get_value (priv->adjustment) + delta,
&handled);
-
- /* Policy DELAYED makes sense with scroll events,
- * but DISCONTINUOUS doesn't, so we update immediately
- * for DISCONTINUOUS
- */
- if (range->update_policy == GTK_UPDATE_DISCONTINUOUS)
- gtk_range_update_value (range);
}
return TRUE;
gtk_range_motion_notify (GtkWidget *widget,
GdkEventMotion *event)
{
- GtkRange *range;
-
- range = GTK_RANGE (widget);
+ GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
gdk_event_request_motions (event);
-
- range->layout->mouse_x = event->x;
- range->layout->mouse_y = event->y;
+
+ priv->mouse_x = event->x;
+ priv->mouse_y = event->y;
if (gtk_range_update_mouse_location (range))
gtk_widget_queue_draw (widget);
- if (range->layout->grab_location == MOUSE_SLIDER)
+ if (priv->grab_location == MOUSE_SLIDER)
update_slider_position (range, event->x, event->y);
/* We handled the event if the mouse was in the range_rect */
- return range->layout->mouse_location != MOUSE_OUTSIDE;
+ return priv->mouse_location != MOUSE_OUTSIDE;
}
static gboolean
GdkEventCrossing *event)
{
GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
- range->layout->mouse_x = event->x;
- range->layout->mouse_y = event->y;
+ priv->mouse_x = event->x;
+ priv->mouse_y = event->y;
if (gtk_range_update_mouse_location (range))
gtk_widget_queue_draw (widget);
GdkEventCrossing *event)
{
GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
- range->layout->mouse_x = -1;
- range->layout->mouse_y = -1;
+ priv->mouse_x = -1;
+ priv->mouse_y = -1;
if (gtk_range_update_mouse_location (range))
gtk_widget_queue_draw (widget);
gtk_range_grab_notify (GtkWidget *widget,
gboolean was_grabbed)
{
- GtkRangeLayout *layout = GTK_RANGE (widget)->layout;
+ GtkRangePrivate *priv = GTK_RANGE (widget)->priv;
- if (layout->grab_device &&
- gtk_widget_device_is_shadowed (widget, layout->grab_device))
+ if (priv->grab_device &&
+ gtk_widget_device_is_shadowed (widget, priv->grab_device))
stop_scrolling (GTK_RANGE (widget));
}
static void
-gtk_range_state_changed (GtkWidget *widget,
- GtkStateType previous_state)
+gtk_range_state_flags_changed (GtkWidget *widget,
+ GtkStateFlags previous_state)
{
if (!gtk_widget_is_sensitive (widget))
stop_scrolling (GTK_RANGE (widget));
}
static gboolean
-layout_changed (GtkRangeLayout *layout1,
- GtkRangeLayout *layout2)
+layout_changed (GtkRangePrivate *priv1,
+ GtkRangePrivate *priv2)
{
- check_rectangle (layout1->slider, layout2->slider);
- check_rectangle (layout1->trough, layout2->trough);
- check_rectangle (layout1->stepper_a, layout2->stepper_a);
- check_rectangle (layout1->stepper_d, layout2->stepper_d);
- check_rectangle (layout1->stepper_b, layout2->stepper_b);
- check_rectangle (layout1->stepper_c, layout2->stepper_c);
+ check_rectangle (priv1->slider, priv2->slider);
+ check_rectangle (priv1->trough, priv2->trough);
+ check_rectangle (priv1->stepper_a, priv2->stepper_a);
+ check_rectangle (priv1->stepper_d, priv2->stepper_d);
+ check_rectangle (priv1->stepper_b, priv2->stepper_b);
+ check_rectangle (priv1->stepper_c, priv2->stepper_c);
- if (layout1->upper_sensitive != layout2->upper_sensitive) return TRUE;
- if (layout1->lower_sensitive != layout2->lower_sensitive) return TRUE;
+ if (priv1->upper_sensitive != priv2->upper_sensitive) return TRUE;
+ if (priv1->lower_sensitive != priv2->lower_sensitive) return TRUE;
return FALSE;
}
gpointer data)
{
GtkRange *range = GTK_RANGE (data);
- /* create a copy of the layout */
- GtkRangeLayout layout = *range->layout;
+ GtkRangePrivate *priv = range->priv;
+ GtkRangePrivate priv_aux = *priv;
+
+ priv->recalc_marks = TRUE;
+ priv->need_recalc = TRUE;
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
- range->layout->recalc_marks = TRUE;
- range->need_recalc = TRUE;
- gtk_range_calc_layout (range, range->adjustment->value);
-
/* now check whether the layout changed */
- if (layout_changed (range->layout, &layout))
+ if (layout_changed (priv, &priv_aux))
gtk_widget_queue_draw (GTK_WIDGET (range));
- /* Note that we don't round off to range->round_digits here.
+ /* Note that we don't round off to priv->round_digits here.
* that's because it's really broken to change a value
* in response to a change signal on that value; round_digits
* is therefore defined to be a filter on what the GtkRange
*/
}
-static gboolean
-force_repaint (gpointer data)
-{
- GtkRange *range = GTK_RANGE (data);
-
- range->layout->repaint_id = 0;
- if (gtk_widget_is_drawable (GTK_WIDGET (range)))
- gdk_window_process_updates (GTK_WIDGET (range)->window, FALSE);
-
- return FALSE;
-}
-
static void
gtk_range_adjustment_value_changed (GtkAdjustment *adjustment,
gpointer data)
{
GtkRange *range = GTK_RANGE (data);
- /* create a copy of the layout */
- GtkRangeLayout layout = *range->layout;
+ GtkRangePrivate *priv = range->priv;
+ GtkRangePrivate priv_aux = *priv;
- range->need_recalc = TRUE;
- gtk_range_calc_layout (range, range->adjustment->value);
+ priv->need_recalc = TRUE;
+ gtk_range_calc_layout (range, gtk_adjustment_get_value (priv->adjustment));
/* now check whether the layout changed */
- if (layout_changed (range->layout, &layout) ||
- (GTK_IS_SCALE (range) && GTK_SCALE (range)->draw_value))
+ if (layout_changed (priv, &priv_aux) ||
+ (GTK_IS_SCALE (range) && gtk_scale_get_draw_value (GTK_SCALE (range))))
{
gtk_widget_queue_draw (GTK_WIDGET (range));
- /* setup a timer to ensure the range isn't lagging too much behind the scroll position */
- if (!range->layout->repaint_id)
- range->layout->repaint_id = gdk_threads_add_timeout_full (GDK_PRIORITY_EVENTS, 181, force_repaint, range, NULL);
}
-
- /* Note that we don't round off to range->round_digits here.
+
+ /* Note that we don't round off to priv->round_digits here.
* that's because it's really broken to change a value
* in response to a change signal on that value; round_digits
* is therefore defined to be a filter on what the GtkRange
}
static void
-gtk_range_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
+gtk_range_style_updated (GtkWidget *widget)
{
GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
- range->need_recalc = TRUE;
+ priv->need_recalc = TRUE;
- GTK_WIDGET_CLASS (gtk_range_parent_class)->style_set (widget, previous_style);
+ GTK_WIDGET_CLASS (gtk_range_parent_class)->style_updated (widget);
}
static void
gdouble oldval,
gdouble *newval)
{
+ GtkRangePrivate *priv = range->priv;
gint i;
gdouble mark;
- for (i = 0; i < range->layout->n_marks; i++)
+ for (i = 0; i < priv->n_marks; i++)
{
- mark = range->layout->marks[i];
+ mark = priv->marks[i];
if ((oldval < mark && mark < *newval) ||
(oldval > mark && mark > *newval))
{
static void
step_back (GtkRange *range)
{
+ GtkRangePrivate *priv = range->priv;
gdouble newval;
gboolean handled;
-
- newval = range->adjustment->value - range->adjustment->step_increment;
- apply_marks (range, range->adjustment->value, &newval);
+
+ newval = gtk_adjustment_get_value (priv->adjustment) - gtk_adjustment_get_step_increment (priv->adjustment);
+ apply_marks (range, gtk_adjustment_get_value (priv->adjustment), &newval);
g_signal_emit (range, signals[CHANGE_VALUE], 0,
GTK_SCROLL_STEP_BACKWARD, newval, &handled);
}
static void
step_forward (GtkRange *range)
{
+ GtkRangePrivate *priv = range->priv;
gdouble newval;
gboolean handled;
- newval = range->adjustment->value + range->adjustment->step_increment;
- apply_marks (range, range->adjustment->value, &newval);
+ newval = gtk_adjustment_get_value (priv->adjustment) + gtk_adjustment_get_step_increment (priv->adjustment);
+ apply_marks (range, gtk_adjustment_get_value (priv->adjustment), &newval);
g_signal_emit (range, signals[CHANGE_VALUE], 0,
GTK_SCROLL_STEP_FORWARD, newval, &handled);
}
static void
page_back (GtkRange *range)
{
+ GtkRangePrivate *priv = range->priv;
gdouble newval;
gboolean handled;
- newval = range->adjustment->value - range->adjustment->page_increment;
- apply_marks (range, range->adjustment->value, &newval);
+ newval = gtk_adjustment_get_value (priv->adjustment) - gtk_adjustment_get_page_increment (priv->adjustment);
+ apply_marks (range, gtk_adjustment_get_value (priv->adjustment), &newval);
g_signal_emit (range, signals[CHANGE_VALUE], 0,
GTK_SCROLL_PAGE_BACKWARD, newval, &handled);
}
static void
page_forward (GtkRange *range)
{
+ GtkRangePrivate *priv = range->priv;
gdouble newval;
gboolean handled;
- newval = range->adjustment->value + range->adjustment->page_increment;
- apply_marks (range, range->adjustment->value, &newval);
+ newval = gtk_adjustment_get_value (priv->adjustment) + gtk_adjustment_get_page_increment (priv->adjustment);
+ apply_marks (range, gtk_adjustment_get_value (priv->adjustment), &newval);
g_signal_emit (range, signals[CHANGE_VALUE], 0,
GTK_SCROLL_PAGE_FORWARD, newval, &handled);
}
static void
scroll_begin (GtkRange *range)
{
+ GtkRangePrivate *priv = range->priv;
gboolean handled;
+
g_signal_emit (range, signals[CHANGE_VALUE], 0,
- GTK_SCROLL_START, range->adjustment->lower,
+ GTK_SCROLL_START, gtk_adjustment_get_lower (priv->adjustment),
&handled);
}
static void
scroll_end (GtkRange *range)
{
+ GtkRangePrivate *priv = range->priv;
gdouble newval;
gboolean handled;
- newval = range->adjustment->upper - range->adjustment->page_size;
+ newval = gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment);
g_signal_emit (range, signals[CHANGE_VALUE], 0, GTK_SCROLL_END, newval,
&handled);
}
gtk_range_scroll (GtkRange *range,
GtkScrollType scroll)
{
- gdouble old_value = range->adjustment->value;
+ GtkRangePrivate *priv = range->priv;
+ gdouble old_value = gtk_adjustment_get_value (priv->adjustment);
switch (scroll)
{
break;
}
- return range->adjustment->value != old_value;
+ return gtk_adjustment_get_value (priv->adjustment) != old_value;
}
static void
gtk_range_move_slider (GtkRange *range,
GtkScrollType scroll)
{
+ GtkRangePrivate *priv = range->priv;
gboolean cursor_only;
g_object_get (gtk_widget_get_settings (GTK_WIDGET (range)),
{
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (range));
- if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
if (scroll == GTK_SCROLL_STEP_UP ||
scroll == GTK_SCROLL_STEP_DOWN)
if (! gtk_range_scroll (range, scroll))
gtk_widget_error_bell (GTK_WIDGET (range));
-
- /* Policy DELAYED makes sense with key events,
- * but DISCONTINUOUS doesn't, so we update immediately
- * for DISCONTINUOUS
- */
- if (range->update_policy == GTK_UPDATE_DISCONTINUOUS)
- gtk_range_update_value (range);
}
static void
"arrow-displacement-y", &tmp_arrow_displacement_y,
NULL);
- if (tmp_stepper_spacing > 0)
- tmp_trough_under_steppers = FALSE;
-
if (gtk_widget_get_can_focus (GTK_WIDGET (range)))
{
gint focus_line_width;
static gboolean
gtk_range_update_mouse_location (GtkRange *range)
{
+ GtkRangePrivate *priv = range->priv;
+ GtkAllocation allocation;
gint x, y;
MouseLocation old;
- GtkWidget *widget;
+ GtkWidget *widget = GTK_WIDGET (range);
- widget = GTK_WIDGET (range);
-
- old = range->layout->mouse_location;
-
- x = range->layout->mouse_x;
- y = range->layout->mouse_y;
-
- if (range->layout->grab_location != MOUSE_OUTSIDE)
- range->layout->mouse_location = range->layout->grab_location;
- else if (POINT_IN_RECT (x, y, range->layout->stepper_a))
- range->layout->mouse_location = MOUSE_STEPPER_A;
- else if (POINT_IN_RECT (x, y, range->layout->stepper_b))
- range->layout->mouse_location = MOUSE_STEPPER_B;
- else if (POINT_IN_RECT (x, y, range->layout->stepper_c))
- range->layout->mouse_location = MOUSE_STEPPER_C;
- else if (POINT_IN_RECT (x, y, range->layout->stepper_d))
- range->layout->mouse_location = MOUSE_STEPPER_D;
- else if (POINT_IN_RECT (x, y, range->layout->slider))
- range->layout->mouse_location = MOUSE_SLIDER;
- else if (POINT_IN_RECT (x, y, range->layout->trough))
- range->layout->mouse_location = MOUSE_TROUGH;
- else if (POINT_IN_RECT (x, y, widget->allocation))
- range->layout->mouse_location = MOUSE_WIDGET;
+ old = priv->mouse_location;
+
+ x = priv->mouse_x;
+ y = priv->mouse_y;
+
+ gtk_widget_get_allocation (widget, &allocation);
+
+ if (priv->grab_location != MOUSE_OUTSIDE)
+ priv->mouse_location = priv->grab_location;
+ else if (POINT_IN_RECT (x, y, priv->stepper_a))
+ priv->mouse_location = MOUSE_STEPPER_A;
+ else if (POINT_IN_RECT (x, y, priv->stepper_b))
+ priv->mouse_location = MOUSE_STEPPER_B;
+ else if (POINT_IN_RECT (x, y, priv->stepper_c))
+ priv->mouse_location = MOUSE_STEPPER_C;
+ else if (POINT_IN_RECT (x, y, priv->stepper_d))
+ priv->mouse_location = MOUSE_STEPPER_D;
+ else if (POINT_IN_RECT (x, y, priv->slider))
+ priv->mouse_location = MOUSE_SLIDER;
+ else if (POINT_IN_RECT (x, y, priv->trough))
+ priv->mouse_location = MOUSE_TROUGH;
+ else if (POINT_IN_RECT (x, y, allocation))
+ priv->mouse_location = MOUSE_WIDGET;
else
- range->layout->mouse_location = MOUSE_OUTSIDE;
+ priv->mouse_location = MOUSE_OUTSIDE;
- return old != range->layout->mouse_location;
+ return old != priv->mouse_location;
}
/* Clamp rect, border inside widget->allocation, such that we prefer
GtkBorder *border,
gboolean border_expands_horizontally)
{
+ GtkAllocation allocation;
gint extra, shortage;
g_return_if_fail (rect->x == 0);
g_return_if_fail (rect->width >= 0);
g_return_if_fail (rect->height >= 0);
+ gtk_widget_get_allocation (widget, &allocation);
+
/* Width */
-
- extra = widget->allocation.width - border->left - border->right - rect->width;
+
+ extra = allocation.width - border->left - border->right - rect->width;
if (extra > 0)
{
if (border_expands_horizontally)
}
/* See if we can fit rect, if not kill the border */
- shortage = rect->width - widget->allocation.width;
+ shortage = rect->width - allocation.width;
if (shortage > 0)
{
- rect->width = widget->allocation.width;
+ rect->width = allocation.width;
/* lose the border */
border->left = 0;
border->right = 0;
else
{
/* See if we can fit rect with borders */
- shortage = rect->width + border->left + border->right -
- widget->allocation.width;
+ shortage = rect->width + border->left + border->right - allocation.width;
if (shortage > 0)
{
/* Shrink borders */
}
/* Height */
-
- extra = widget->allocation.height - border->top - border->bottom - rect->height;
+
+ extra = allocation.height - border->top - border->bottom - rect->height;
if (extra > 0)
{
if (border_expands_horizontally)
}
/* See if we can fit rect, if not kill the border */
- shortage = rect->height - widget->allocation.height;
+ shortage = rect->height - allocation.height;
if (shortage > 0)
{
- rect->height = widget->allocation.height;
+ rect->height = allocation.height;
/* lose the border */
border->top = 0;
border->bottom = 0;
else
{
/* See if we can fit rect with borders */
- shortage = rect->height + border->top + border->bottom -
- widget->allocation.height;
+ shortage = rect->height + border->top + border->bottom - allocation.height;
if (shortage > 0)
{
/* Shrink borders */
gboolean *has_steppers_cd,
gint *slider_length_p)
{
+ GtkRangePrivate *priv = range->priv;
gint slider_length;
gint n_steppers;
gint n_steppers_ab;
n_steppers_ab = 0;
n_steppers_cd = 0;
- if (range->has_stepper_a)
+ if (priv->has_stepper_a)
n_steppers_ab += 1;
- if (range->has_stepper_b)
+ if (priv->has_stepper_b)
n_steppers_ab += 1;
- if (range->has_stepper_c)
+ if (priv->has_stepper_c)
n_steppers_cd += 1;
- if (range->has_stepper_d)
+ if (priv->has_stepper_d)
n_steppers_cd += 1;
n_steppers = n_steppers_ab + n_steppers_cd;
- slider_length = range->min_slider_size;
+ slider_length = priv->min_slider_size;
range_rect->x = 0;
range_rect->y = 0;
/* We never expand to fill available space in the small dimension
* (i.e. vertical scrollbars are always a fixed width)
*/
- if (range->orientation == GTK_ORIENTATION_VERTICAL)
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
{
range_rect->width = (focus_width + trough_border) * 2 + slider_width;
range_rect->height = stepper_size * n_steppers + (focus_width + trough_border) * 2 + slider_length;
gtk_range_calc_layout (GtkRange *range,
gdouble adjustment_value)
{
+ GtkRangePrivate *priv = range->priv;
gint slider_width, stepper_size, focus_width, trough_border, stepper_spacing;
gint slider_length;
- GtkBorder border;
+ GtkBorder border, trough_margin;
gint n_steppers;
gboolean has_steppers_ab;
gboolean has_steppers_cd;
gboolean trough_under_steppers;
GdkRectangle range_rect;
- GtkRangeLayout *layout;
GtkWidget *widget;
-
- if (!range->need_recalc)
+ GtkStyleContext *context;
+ GtkStateFlags state;
+
+ if (!priv->need_recalc)
return;
/* If we have a too-small allocation, we prefer the steppers over
* Also, we prefer to draw the range itself rather than the border
* areas if there's a conflict, since the borders will be decoration
* not controls. Though this depends on subclasses cooperating by
- * not drawing on range->range_rect.
+ * not drawing on priv->range_rect.
*/
widget = GTK_WIDGET (range);
- layout = range->layout;
-
+ context = gtk_widget_get_style_context (widget);
+
+ state = gtk_widget_get_state_flags (widget);
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_TROUGH);
+ gtk_style_context_get_margin (context, state, &trough_margin);
+ gtk_style_context_restore (context);
+
gtk_range_get_props (range,
&slider_width, &stepper_size,
&focus_width, &trough_border,
/* We never expand to fill available space in the small dimension
* (i.e. vertical scrollbars are always a fixed width)
*/
- if (range->orientation == GTK_ORIENTATION_VERTICAL)
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
{
clamp_dimensions (widget, &range_rect, &border, TRUE);
}
range_rect.x = border.left;
range_rect.y = border.top;
-
- range->range_rect = range_rect;
-
- if (range->orientation == GTK_ORIENTATION_VERTICAL)
+
+ priv->range_rect = range_rect;
+
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
{
gint stepper_width, stepper_height;
/* Stepper A */
- layout->stepper_a.x = range_rect.x + focus_width + trough_border * trough_under_steppers;
- layout->stepper_a.y = range_rect.y + focus_width + trough_border * trough_under_steppers;
+ priv->stepper_a.x = range_rect.x + focus_width + trough_border * trough_under_steppers;
+ priv->stepper_a.y = range_rect.y + focus_width + trough_border * trough_under_steppers;
- if (range->has_stepper_a)
+ if (priv->has_stepper_a)
{
- layout->stepper_a.width = stepper_width;
- layout->stepper_a.height = stepper_height;
+ priv->stepper_a.width = stepper_width;
+ priv->stepper_a.height = stepper_height;
}
else
{
- layout->stepper_a.width = 0;
- layout->stepper_a.height = 0;
+ priv->stepper_a.width = 0;
+ priv->stepper_a.height = 0;
}
/* Stepper B */
- layout->stepper_b.x = layout->stepper_a.x;
- layout->stepper_b.y = layout->stepper_a.y + layout->stepper_a.height;
+ priv->stepper_b.x = priv->stepper_a.x;
+ priv->stepper_b.y = priv->stepper_a.y + priv->stepper_a.height;
- if (range->has_stepper_b)
+ if (priv->has_stepper_b)
{
- layout->stepper_b.width = stepper_width;
- layout->stepper_b.height = stepper_height;
+ priv->stepper_b.width = stepper_width;
+ priv->stepper_b.height = stepper_height;
}
else
{
- layout->stepper_b.width = 0;
- layout->stepper_b.height = 0;
+ priv->stepper_b.width = 0;
+ priv->stepper_b.height = 0;
}
/* Stepper D */
- if (range->has_stepper_d)
+ if (priv->has_stepper_d)
{
- layout->stepper_d.width = stepper_width;
- layout->stepper_d.height = stepper_height;
+ priv->stepper_d.width = stepper_width;
+ priv->stepper_d.height = stepper_height;
}
else
{
- layout->stepper_d.width = 0;
- layout->stepper_d.height = 0;
+ priv->stepper_d.width = 0;
+ priv->stepper_d.height = 0;
}
- layout->stepper_d.x = layout->stepper_a.x;
- layout->stepper_d.y = range_rect.y + range_rect.height - layout->stepper_d.height - focus_width - trough_border * trough_under_steppers;
+ priv->stepper_d.x = priv->stepper_a.x;
+ priv->stepper_d.y = range_rect.y + range_rect.height - priv->stepper_d.height - focus_width - trough_border * trough_under_steppers;
/* Stepper C */
- if (range->has_stepper_c)
+ if (priv->has_stepper_c)
{
- layout->stepper_c.width = stepper_width;
- layout->stepper_c.height = stepper_height;
+ priv->stepper_c.width = stepper_width;
+ priv->stepper_c.height = stepper_height;
}
else
{
- layout->stepper_c.width = 0;
- layout->stepper_c.height = 0;
+ priv->stepper_c.width = 0;
+ priv->stepper_c.height = 0;
}
- layout->stepper_c.x = layout->stepper_a.x;
- layout->stepper_c.y = layout->stepper_d.y - layout->stepper_c.height;
+ priv->stepper_c.x = priv->stepper_a.x;
+ priv->stepper_c.y = priv->stepper_d.y - priv->stepper_c.height;
/* Now the trough is the remaining space between steppers B and C,
* if any, minus spacing
*/
- layout->trough.x = range_rect.x;
- layout->trough.y = layout->stepper_b.y + layout->stepper_b.height + stepper_spacing * has_steppers_ab;
- layout->trough.width = range_rect.width;
- layout->trough.height = layout->stepper_c.y - layout->trough.y - stepper_spacing * has_steppers_cd;
+ priv->trough.x = range_rect.x;
+ priv->trough.y = priv->stepper_b.y + priv->stepper_b.height + stepper_spacing * has_steppers_ab;
+ priv->trough.width = range_rect.width;
+ priv->trough.height = priv->stepper_c.y - priv->trough.y - stepper_spacing * has_steppers_cd;
/* Slider fits into the trough, with stepper_spacing on either side,
* and the size/position based on the adjustment or fixed, depending.
*/
- layout->slider.x = layout->trough.x + focus_width + trough_border;
- layout->slider.width = layout->trough.width - (focus_width + trough_border) * 2;
+ priv->slider.x = priv->trough.x + focus_width + trough_border;
+ priv->slider.width = priv->trough.width - (focus_width + trough_border) * 2;
/* Compute slider position/length */
{
gint y, bottom, top, height;
- top = layout->trough.y;
- bottom = layout->trough.y + layout->trough.height;
+ top = priv->trough.y;
+ bottom = priv->trough.y + priv->trough.height;
if (! trough_under_steppers)
{
* total_adjustment_range) times the trough height in pixels
*/
- if (range->adjustment->upper - range->adjustment->lower != 0)
- height = ((bottom - top) * (range->adjustment->page_size /
- (range->adjustment->upper - range->adjustment->lower)));
+ if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) != 0)
+ height = ((bottom - top) * (gtk_adjustment_get_page_size (priv->adjustment) /
+ (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment))));
else
- height = range->min_slider_size;
-
- if (height < range->min_slider_size ||
- range->slider_size_fixed)
- height = range->min_slider_size;
+ height = priv->min_slider_size;
+
+ if (height < priv->min_slider_size ||
+ priv->slider_size_fixed)
+ height = priv->min_slider_size;
- height = MIN (height, layout->trough.height);
+ height = MIN (height, priv->trough.height);
y = top;
-
- if (range->adjustment->upper - range->adjustment->lower - range->adjustment->page_size != 0)
- y += (bottom - top - height) * ((adjustment_value - range->adjustment->lower) /
- (range->adjustment->upper - range->adjustment->lower - range->adjustment->page_size));
-
+
+ if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment) != 0)
+ y += (bottom - top - height) * ((adjustment_value - gtk_adjustment_get_lower (priv->adjustment)) /
+ (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment)));
+
y = CLAMP (y, top, bottom);
if (should_invert (range))
y = bottom - (y - top + height);
- layout->slider.y = y;
- layout->slider.height = height;
+ priv->slider.y = y;
+ priv->slider.height = height;
/* These are publically exported */
- range->slider_start = layout->slider.y;
- range->slider_end = layout->slider.y + layout->slider.height;
+ priv->slider_start = priv->slider.y;
+ priv->slider_end = priv->slider.y + priv->slider.height;
}
}
else
/* Stepper A */
- layout->stepper_a.x = range_rect.x + focus_width + trough_border * trough_under_steppers;
- layout->stepper_a.y = range_rect.y + focus_width + trough_border * trough_under_steppers;
+ priv->stepper_a.x = range_rect.x + focus_width + trough_border * trough_under_steppers;
+ priv->stepper_a.y = range_rect.y + focus_width + trough_border * trough_under_steppers;
- if (range->has_stepper_a)
+ if (priv->has_stepper_a)
{
- layout->stepper_a.width = stepper_width;
- layout->stepper_a.height = stepper_height;
+ priv->stepper_a.width = stepper_width;
+ priv->stepper_a.height = stepper_height;
}
else
{
- layout->stepper_a.width = 0;
- layout->stepper_a.height = 0;
+ priv->stepper_a.width = 0;
+ priv->stepper_a.height = 0;
}
/* Stepper B */
- layout->stepper_b.x = layout->stepper_a.x + layout->stepper_a.width;
- layout->stepper_b.y = layout->stepper_a.y;
+ priv->stepper_b.x = priv->stepper_a.x + priv->stepper_a.width;
+ priv->stepper_b.y = priv->stepper_a.y;
- if (range->has_stepper_b)
+ if (priv->has_stepper_b)
{
- layout->stepper_b.width = stepper_width;
- layout->stepper_b.height = stepper_height;
+ priv->stepper_b.width = stepper_width;
+ priv->stepper_b.height = stepper_height;
}
else
{
- layout->stepper_b.width = 0;
- layout->stepper_b.height = 0;
+ priv->stepper_b.width = 0;
+ priv->stepper_b.height = 0;
}
/* Stepper D */
- if (range->has_stepper_d)
+ if (priv->has_stepper_d)
{
- layout->stepper_d.width = stepper_width;
- layout->stepper_d.height = stepper_height;
+ priv->stepper_d.width = stepper_width;
+ priv->stepper_d.height = stepper_height;
}
else
{
- layout->stepper_d.width = 0;
- layout->stepper_d.height = 0;
+ priv->stepper_d.width = 0;
+ priv->stepper_d.height = 0;
}
- layout->stepper_d.x = range_rect.x + range_rect.width - layout->stepper_d.width - focus_width - trough_border * trough_under_steppers;
- layout->stepper_d.y = layout->stepper_a.y;
+ priv->stepper_d.x = range_rect.x + range_rect.width - priv->stepper_d.width - focus_width - trough_border * trough_under_steppers;
+ priv->stepper_d.y = priv->stepper_a.y;
/* Stepper C */
- if (range->has_stepper_c)
+ if (priv->has_stepper_c)
{
- layout->stepper_c.width = stepper_width;
- layout->stepper_c.height = stepper_height;
+ priv->stepper_c.width = stepper_width;
+ priv->stepper_c.height = stepper_height;
}
else
{
- layout->stepper_c.width = 0;
- layout->stepper_c.height = 0;
+ priv->stepper_c.width = 0;
+ priv->stepper_c.height = 0;
}
- layout->stepper_c.x = layout->stepper_d.x - layout->stepper_c.width;
- layout->stepper_c.y = layout->stepper_a.y;
+ priv->stepper_c.x = priv->stepper_d.x - priv->stepper_c.width;
+ priv->stepper_c.y = priv->stepper_a.y;
/* Now the trough is the remaining space between steppers B and C,
* if any
*/
- layout->trough.x = layout->stepper_b.x + layout->stepper_b.width + stepper_spacing * has_steppers_ab;
- layout->trough.y = range_rect.y;
-
- layout->trough.width = layout->stepper_c.x - layout->trough.x - stepper_spacing * has_steppers_cd;
- layout->trough.height = range_rect.height;
+ priv->trough.x = priv->stepper_b.x + priv->stepper_b.width + stepper_spacing * has_steppers_ab;
+ priv->trough.y = range_rect.y;
+ priv->trough.width = priv->stepper_c.x - priv->trough.x - stepper_spacing * has_steppers_cd;
+ priv->trough.height = range_rect.height;
/* Slider fits into the trough, with stepper_spacing on either side,
* and the size/position based on the adjustment or fixed, depending.
*/
- layout->slider.y = layout->trough.y + focus_width + trough_border;
- layout->slider.height = layout->trough.height - (focus_width + trough_border) * 2;
+ priv->slider.y = priv->trough.y + focus_width + trough_border;
+ priv->slider.height = priv->trough.height - (focus_width + trough_border) * 2;
/* Compute slider position/length */
{
gint x, left, right, width;
- left = layout->trough.x;
- right = layout->trough.x + layout->trough.width;
+ left = priv->trough.x;
+ right = priv->trough.x + priv->trough.width;
if (! trough_under_steppers)
{
/* slider width is the fraction (page_size /
* total_adjustment_range) times the trough width in pixels
*/
-
- if (range->adjustment->upper - range->adjustment->lower != 0)
- width = ((right - left) * (range->adjustment->page_size /
- (range->adjustment->upper - range->adjustment->lower)));
+
+ if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) != 0)
+ width = ((right - left) * (gtk_adjustment_get_page_size (priv->adjustment) /
+ (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment))));
else
- width = range->min_slider_size;
-
- if (width < range->min_slider_size ||
- range->slider_size_fixed)
- width = range->min_slider_size;
-
- width = MIN (width, layout->trough.width);
+ width = priv->min_slider_size;
+
+ if (width < priv->min_slider_size ||
+ priv->slider_size_fixed)
+ width = priv->min_slider_size;
+
+ width = MIN (width, priv->trough.width);
x = left;
-
- if (range->adjustment->upper - range->adjustment->lower - range->adjustment->page_size != 0)
- x += (right - left - width) * ((adjustment_value - range->adjustment->lower) /
- (range->adjustment->upper - range->adjustment->lower - range->adjustment->page_size));
+
+ if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment) != 0)
+ x += (right - left - width) * ((adjustment_value - gtk_adjustment_get_lower (priv->adjustment)) /
+ (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment)));
x = CLAMP (x, left, right);
if (should_invert (range))
x = right - (x - left + width);
- layout->slider.x = x;
- layout->slider.width = width;
+ priv->slider.x = x;
+ priv->slider.width = width;
/* These are publically exported */
- range->slider_start = layout->slider.x;
- range->slider_end = layout->slider.x + layout->slider.width;
+ priv->slider_start = priv->slider.x;
+ priv->slider_end = priv->slider.x + priv->slider.width;
}
}
gtk_range_update_mouse_location (range);
- switch (range->layout->upper_sensitivity)
+ switch (priv->upper_sensitivity)
{
case GTK_SENSITIVITY_AUTO:
- range->layout->upper_sensitive =
- (range->adjustment->value <
- (range->adjustment->upper - range->adjustment->page_size));
+ priv->upper_sensitive =
+ (gtk_adjustment_get_value (priv->adjustment) <
+ (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment)));
break;
case GTK_SENSITIVITY_ON:
- range->layout->upper_sensitive = TRUE;
+ priv->upper_sensitive = TRUE;
break;
case GTK_SENSITIVITY_OFF:
- range->layout->upper_sensitive = FALSE;
+ priv->upper_sensitive = FALSE;
break;
}
- switch (range->layout->lower_sensitivity)
+ switch (priv->lower_sensitivity)
{
case GTK_SENSITIVITY_AUTO:
- range->layout->lower_sensitive =
- (range->adjustment->value > range->adjustment->lower);
+ priv->lower_sensitive =
+ (gtk_adjustment_get_value (priv->adjustment) > gtk_adjustment_get_lower (priv->adjustment));
break;
case GTK_SENSITIVITY_ON:
- range->layout->lower_sensitive = TRUE;
+ priv->lower_sensitive = TRUE;
break;
case GTK_SENSITIVITY_OFF:
- range->layout->lower_sensitive = FALSE;
+ priv->lower_sensitive = FALSE;
break;
}
}
get_area (GtkRange *range,
MouseLocation location)
{
+ GtkRangePrivate *priv = range->priv;
+
switch (location)
{
case MOUSE_STEPPER_A:
- return &range->layout->stepper_a;
+ return &priv->stepper_a;
case MOUSE_STEPPER_B:
- return &range->layout->stepper_b;
+ return &priv->stepper_b;
case MOUSE_STEPPER_C:
- return &range->layout->stepper_c;
+ return &priv->stepper_c;
case MOUSE_STEPPER_D:
- return &range->layout->stepper_d;
+ return &priv->stepper_d;
case MOUSE_TROUGH:
- return &range->layout->trough;
+ return &priv->trough;
case MOUSE_SLIDER:
- return &range->layout->slider;
+ return &priv->slider;
case MOUSE_WIDGET:
case MOUSE_OUTSIDE:
break;
static void
gtk_range_calc_marks (GtkRange *range)
{
+ GtkRangePrivate *priv = range->priv;
gint i;
-
- if (!range->layout->recalc_marks)
+
+ if (!priv->recalc_marks)
return;
- range->layout->recalc_marks = FALSE;
+ priv->recalc_marks = FALSE;
- for (i = 0; i < range->layout->n_marks; i++)
+ for (i = 0; i < priv->n_marks; i++)
{
- range->need_recalc = TRUE;
- gtk_range_calc_layout (range, range->layout->marks[i]);
- if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
- range->layout->mark_pos[i] = range->layout->slider.x + range->layout->slider.width / 2;
+ priv->need_recalc = TRUE;
+ gtk_range_calc_layout (range, priv->marks[i]);
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ priv->mark_pos[i] = priv->slider.x + priv->slider.width / 2;
else
- range->layout->mark_pos[i] = range->layout->slider.y + range->layout->slider.height / 2;
+ priv->mark_pos[i] = priv->slider.y + priv->slider.height / 2;
}
- range->need_recalc = TRUE;
+ priv->need_recalc = TRUE;
}
static gboolean
GtkScrollType scroll,
gdouble value)
{
+ GtkRangePrivate *priv = range->priv;
+
/* potentially adjust the bounds _before_ we clamp */
g_signal_emit (range, signals[ADJUST_BOUNDS], 0, value);
- if (range->layout->restrict_to_fill_level)
- value = MIN (value, MAX (range->adjustment->lower,
- range->layout->fill_level));
+ if (priv->restrict_to_fill_level)
+ value = MIN (value, MAX (gtk_adjustment_get_lower (priv->adjustment),
+ priv->fill_level));
- value = CLAMP (value, range->adjustment->lower,
- (range->adjustment->upper - range->adjustment->page_size));
+ value = CLAMP (value, gtk_adjustment_get_lower (priv->adjustment),
+ (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment)));
- if (range->round_digits >= 0)
+ if (priv->round_digits >= 0)
{
gdouble power;
gint i;
- i = range->round_digits;
+ i = priv->round_digits;
power = 1;
while (i--)
power *= 10;
value = floor ((value * power) + 0.5) / power;
}
-
- if (range->adjustment->value != value)
+
+ if (gtk_adjustment_get_value (priv->adjustment) != value)
{
- range->need_recalc = TRUE;
+ priv->need_recalc = TRUE;
gtk_widget_queue_draw (GTK_WIDGET (range));
-
- switch (range->update_policy)
- {
- case GTK_UPDATE_CONTINUOUS:
- gtk_adjustment_set_value (range->adjustment, value);
- break;
-
- /* Delayed means we update after a period of inactivity */
- case GTK_UPDATE_DELAYED:
- gtk_range_reset_update_timer (range);
- /* FALL THRU */
- /* Discontinuous means we update on button release */
- case GTK_UPDATE_DISCONTINUOUS:
- /* don't emit value_changed signal */
- range->adjustment->value = value;
- range->update_pending = TRUE;
- break;
- }
+ gtk_adjustment_set_value (priv->adjustment, value);
}
return FALSE;
}
-static void
-gtk_range_update_value (GtkRange *range)
-{
- gtk_range_remove_update_timer (range);
-
- if (range->update_pending)
- {
- gtk_adjustment_value_changed (range->adjustment);
-
- range->update_pending = FALSE;
- }
-}
-
struct _GtkRangeStepTimer
{
guint timeout_id;
static gboolean
second_timeout (gpointer data)
{
- GtkRange *range;
+ GtkRange *range = GTK_RANGE (data);
+ GtkRangePrivate *priv = range->priv;
+
+ gtk_range_scroll (range, priv->timer->step);
- range = GTK_RANGE (data);
- gtk_range_scroll (range, range->timer->step);
-
return TRUE;
}
static gboolean
initial_timeout (gpointer data)
{
- GtkRange *range;
+ GtkRange *range = GTK_RANGE (data);
+ GtkRangePrivate *priv = range->priv;
GtkSettings *settings;
guint timeout;
settings = gtk_widget_get_settings (GTK_WIDGET (data));
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
- range = GTK_RANGE (data);
- range->timer->timeout_id = gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR,
- second_timeout,
- range);
+ priv->timer->timeout_id = gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR,
+ second_timeout,
+ range);
/* remove self */
return FALSE;
}
gtk_range_add_step_timer (GtkRange *range,
GtkScrollType step)
{
+ GtkRangePrivate *priv = range->priv;
GtkSettings *settings;
guint timeout;
- g_return_if_fail (range->timer == NULL);
+ g_return_if_fail (priv->timer == NULL);
g_return_if_fail (step != GTK_SCROLL_NONE);
settings = gtk_widget_get_settings (GTK_WIDGET (range));
g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
- range->timer = g_new (GtkRangeStepTimer, 1);
+ priv->timer = g_new (GtkRangeStepTimer, 1);
- range->timer->timeout_id = gdk_threads_add_timeout (timeout,
- initial_timeout,
- range);
- range->timer->step = step;
+ priv->timer->timeout_id = gdk_threads_add_timeout (timeout,
+ initial_timeout,
+ range);
+ priv->timer->step = step;
- gtk_range_scroll (range, range->timer->step);
+ gtk_range_scroll (range, priv->timer->step);
}
static void
gtk_range_remove_step_timer (GtkRange *range)
{
- if (range->timer)
+ GtkRangePrivate *priv = range->priv;
+
+ if (priv->timer)
{
- if (range->timer->timeout_id != 0)
- g_source_remove (range->timer->timeout_id);
+ if (priv->timer->timeout_id != 0)
+ g_source_remove (priv->timer->timeout_id);
- g_free (range->timer);
+ g_free (priv->timer);
- range->timer = NULL;
+ priv->timer = NULL;
}
}
-static gboolean
-update_timeout (gpointer data)
-{
- GtkRange *range;
-
- range = GTK_RANGE (data);
- gtk_range_update_value (range);
- range->update_timeout_id = 0;
-
- /* self-remove */
- return FALSE;
-}
-
-static void
-gtk_range_reset_update_timer (GtkRange *range)
+void
+_gtk_range_set_has_origin (GtkRange *range,
+ gboolean has_origin)
{
- gtk_range_remove_update_timer (range);
-
- range->update_timeout_id = gdk_threads_add_timeout (UPDATE_DELAY,
- update_timeout,
- range);
+ range->priv->has_origin = has_origin;
}
-static void
-gtk_range_remove_update_timer (GtkRange *range)
+gboolean
+_gtk_range_get_has_origin (GtkRange *range)
{
- if (range->update_timeout_id != 0)
- {
- g_source_remove (range->update_timeout_id);
- range->update_timeout_id = 0;
- }
+ return range->priv->has_origin;
}
void
gdouble *values,
gint n_values)
{
+ GtkRangePrivate *priv = range->priv;
gint i;
- g_free (range->layout->marks);
- range->layout->marks = g_new (gdouble, n_values);
+ g_free (priv->marks);
+ priv->marks = g_new (gdouble, n_values);
- g_free (range->layout->mark_pos);
- range->layout->mark_pos = g_new (gint, n_values);
+ g_free (priv->mark_pos);
+ priv->mark_pos = g_new (gint, n_values);
- range->layout->n_marks = n_values;
+ priv->n_marks = n_values;
for (i = 0; i < n_values; i++)
- range->layout->marks[i] = values[i];
+ priv->marks[i] = values[i];
- range->layout->recalc_marks = TRUE;
+ priv->recalc_marks = TRUE;
}
gint
_gtk_range_get_stop_positions (GtkRange *range,
gint **values)
{
+ GtkRangePrivate *priv = range->priv;
+
gtk_range_calc_marks (range);
if (values)
- *values = g_memdup (range->layout->mark_pos, range->layout->n_marks * sizeof (gint));
+ *values = g_memdup (priv->mark_pos, priv->n_marks * sizeof (gint));
+
+ return priv->n_marks;
+}
+
+/**
+ * gtk_range_set_round_digits:
+ * @range: a #GtkRange
+ * @round_digits: the precision in digits, or -1
+ *
+ * Sets the number of digits to round the value to when
+ * it changes. See #GtkRange::change-value.
+ *
+ * Since: 2.24
+ */
+void
+gtk_range_set_round_digits (GtkRange *range,
+ gint round_digits)
+{
+ g_return_if_fail (GTK_IS_RANGE (range));
+ g_return_if_fail (round_digits >= -1);
+
+ range->priv->round_digits = round_digits;
+
+ g_object_notify (G_OBJECT (range), "round-digits");
+}
+
+/**
+ * gtk_range_get_round_digits:
+ * @range: a #GtkRange
+ *
+ * Gets the number of digits to round the value to when
+ * it changes. See #GtkRange::change-value.
+ *
+ * Return value: the number of digits to round to
+ *
+ * Since: 2.24
+ */
+gint
+gtk_range_get_round_digits (GtkRange *range)
+{
+ g_return_val_if_fail (GTK_IS_RANGE (range), -1);
- return range->layout->n_marks;
+ return range->priv->round_digits;
}
-#define __GTK_RANGE_C__
-#include "gtkaliasdef.c"
+void
+_gtk_range_set_steppers (GtkRange *range,
+ gboolean has_a,
+ gboolean has_b,
+ gboolean has_c,
+ gboolean has_d)
+{
+ range->priv->has_stepper_a = has_a;
+ range->priv->has_stepper_b = has_b;
+ range->priv->has_stepper_c = has_c;
+ range->priv->has_stepper_d = has_d;
+}
projects / ~andy / gtk / blobdiff