X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkscalebutton.c;h=f10bb0308d7787a2ad7e65667520ca9f2e177ff4;hb=79695ee64d41c9aadfe2c6f18dc7dd1e3fd44852;hp=7662fb62cd94e2370b3edcdd4c546c3075358eca;hpb=0d7f4951d1ba413f41ec27935aee31a7ab4f9880;p=~andy%2Fgtk
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 7662fb62c..f10bb0308 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -21,76 +21,108 @@
* 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 .
*/
/*
* Modified by the GTK+ Team and others 2007. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include
+#include "config.h"
+#include "gtkscalebutton.h"
+
+#ifndef _WIN32
#define _GNU_SOURCE
+#endif
#include
#include
#include
-#include "gtkmain.h"
-#include "gtkintl.h"
-#include "gtkrange.h"
+#include "gtkadjustment.h"
#include "gtkbindings.h"
-#include "gtkscale.h"
-#include "gtkvscale.h"
#include "gtkframe.h"
-#include "gtkvbox.h"
-#include "gtkwindow.h"
+#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtkstock.h"
+#include "gtkorientable.h"
#include "gtkprivate.h"
+#include "gtkscale.h"
+#include "gtkstock.h"
+#include "gtkbox.h"
+#include "gtkwindow.h"
+#include "gtktypebuiltins.h"
+#include "gtkintl.h"
+#include "a11y/gtkscalebuttonaccessible.h"
-#include
-#include
-#include "gtkscalebutton.h"
+/**
+ * SECTION:gtkscalebutton
+ * @Short_description: A button which pops up a scale
+ * @Title: GtkScaleButton
+ *
+ * #GtkScaleButton provides a button which pops up a scale widget.
+ * This kind of widget is commonly used for volume controls in multimedia
+ * applications, and GTK+ provides a #GtkVolumeButton subclass that
+ * is tailored for this use case.
+ */
-#include "gtkalias.h"
#define SCALE_SIZE 100
#define CLICK_TIMEOUT 250
-enum {
+enum
+{
VALUE_CHANGED,
POPUP,
POPDOWN,
+
LAST_SIGNAL
};
-enum {
+enum
+{
PROP_0,
+
+ PROP_ORIENTATION,
PROP_VALUE,
PROP_SIZE,
PROP_ADJUSTMENT,
PROP_ICONS
};
-struct _GtkScaleButtonPrivate {
- GtkWidget *dock, *scale, *image;
+struct _GtkScaleButtonPrivate
+{
+ GtkWidget *plus_button;
+ GtkWidget *minus_button;
+ GtkWidget *dock;
+ GtkWidget *box;
+ GtkWidget *scale;
+ GtkWidget *image;
+
GtkIconSize size;
+ GtkOrientation orientation;
+
guint click_id;
+ gint click_timeout;
+ guint timeout : 1;
gdouble direction;
guint32 pop_time;
+
gchar **icon_list;
- gint click_timeout;
- guint timeout : 1;
-} _GtkScaleButtonPrivate;
-static void gtk_scale_button_class_init (GtkScaleButtonClass *klass);
-static void gtk_scale_button_init (GtkScaleButton *button);
+ GdkDevice *grab_pointer;
+ GdkDevice *grab_keyboard;
+
+ GtkAdjustment *adjustment; /* needed because it must be settable in init() */
+};
+
+static GObject* gtk_scale_button_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_params);
static void gtk_scale_button_dispose (GObject *object);
+static void gtk_scale_button_finalize (GObject *object);
static void gtk_scale_button_set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -99,6 +131,8 @@ static void gtk_scale_button_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
+static void gtk_scale_button_set_orientation_private (GtkScaleButton *button,
+ GtkOrientation orientation);
static gboolean gtk_scale_button_scroll (GtkWidget *widget,
GdkEventScroll *event);
static void gtk_scale_button_screen_changed (GtkWidget *widget,
@@ -107,8 +141,8 @@ static gboolean gtk_scale_button_press (GtkWidget *widget,
GdkEventButton *event);
static gboolean gtk_scale_button_key_release (GtkWidget *widget,
GdkEventKey *event);
-static void gtk_scale_button_popup_from_bindings (GtkWidget *widget);
-static void gtk_scale_button_popdown_from_bindings (GtkWidget *widget);
+static void gtk_scale_button_popup (GtkWidget *widget);
+static void gtk_scale_button_popdown (GtkWidget *widget);
static gboolean cb_dock_button_press (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data);
@@ -134,33 +168,50 @@ static void gtk_scale_button_update_icon (GtkScaleButton *button);
static void gtk_scale_button_scale_value_changed(GtkRange *range);
/* see below for scale definitions */
-static GtkWidget *gtk_scale_button_scale_new (GtkScaleButton *button,
- gdouble min,
- gdouble max,
- gdouble step);
+static GtkWidget *gtk_scale_button_scale_new (GtkScaleButton *button);
-static GtkButtonClass *parent_class = NULL;
-static guint signals[LAST_SIGNAL] = { 0 };
+G_DEFINE_TYPE_WITH_CODE (GtkScaleButton, gtk_scale_button, GTK_TYPE_BUTTON,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
+ NULL))
-G_DEFINE_TYPE (GtkScaleButton, gtk_scale_button, GTK_TYPE_BUTTON)
+static guint signals[LAST_SIGNAL] = { 0, };
static void
gtk_scale_button_class_init (GtkScaleButtonClass *klass)
{
- GtkBindingSet *binding_set;
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+ GtkBindingSet *binding_set;
- parent_class = g_type_class_peek_parent (klass);
+ g_type_class_add_private (klass, sizeof (GtkScaleButtonPrivate));
+ gobject_class->constructor = gtk_scale_button_constructor;
+ gobject_class->finalize = gtk_scale_button_finalize;
gobject_class->dispose = gtk_scale_button_dispose;
gobject_class->set_property = gtk_scale_button_set_property;
gobject_class->get_property = gtk_scale_button_get_property;
+
widget_class->button_press_event = gtk_scale_button_press;
widget_class->key_release_event = gtk_scale_button_key_release;
widget_class->scroll_event = gtk_scale_button_scroll;
widget_class->screen_changed = gtk_scale_button_screen_changed;
+ /**
+ * GtkScaleButton:orientation:
+ *
+ * The orientation of the #GtkScaleButton's popup window.
+ *
+ * Note that since GTK+ 2.16, #GtkScaleButton implements the
+ * #GtkOrientable interface which has its own @orientation
+ * property. However we redefine the property here in order to
+ * override its default horizontal orientation.
+ *
+ * Since: 2.14
+ **/
+ g_object_class_override_property (gobject_class,
+ PROP_ORIENTATION,
+ "orientation");
+
g_object_class_install_property (gobject_class,
PROP_VALUE,
g_param_spec_double ("value",
@@ -191,20 +242,20 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
/**
* GtkScaleButton:icons:
*
- * The names of the icons to be used by the scale button.
- * The first item in the array will be used in the button
- * when the current value is the lowest value, the second
- * item for the highest value. All the subsequent icons will
- * be used for all the other values, spread evenly over the
+ * The names of the icons to be used by the scale button.
+ * The first item in the array will be used in the button
+ * when the current value is the lowest value, the second
+ * item for the highest value. All the subsequent icons will
+ * be used for all the other values, spread evenly over the
* range of values.
*
- * If there's only one icon name in the @icons array, it will
- * be used for all the values. If only two icon names are in
- * the @icons array, the first one will be used for the bottom
+ * If there's only one icon name in the @icons array, it will
+ * be used for all the values. If only two icon names are in
+ * the @icons array, the first one will be used for the bottom
* 50% of the scale, and the second one for the top 50%.
*
- * It is recommended to use at least 3 icons so that the
- * #GtkScaleButton reflects the current value of the scale
+ * It is recommended to use at least 3 icons so that the
+ * #GtkScaleButton reflects the current value of the scale
* better for the users.
*
* Since: 2.12
@@ -216,14 +267,16 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
P_("List of icon names"),
G_TYPE_STRV,
GTK_PARAM_READWRITE));
+
/**
* GtkScaleButton::value-changed:
- * @button: the object that received the signal
+ * @button: the object which received the signal
+ * @value: the new value
*
- * Emitted when the value field has changed.
+ * The ::value-changed signal is emitted when the value field has
+ * changed.
*
* Since: 2.12
- *
*/
signals[VALUE_CHANGED] =
g_signal_new (I_("value-changed"),
@@ -233,50 +286,82 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
NULL, NULL,
_gtk_marshal_VOID__DOUBLE,
G_TYPE_NONE, 1, G_TYPE_DOUBLE);
+
+ /**
+ * GtkScaleButton::popup:
+ * @button: the object which received the signal
+ *
+ * The ::popup signal is a
+ * keybinding signal
+ * which gets emitted to popup the scale widget.
+ *
+ * The default bindings for this signal are Space, Enter and Return.
+ *
+ * Since: 2.12
+ */
signals[POPUP] =
- _gtk_binding_signal_new (I_("popup"),
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_CALLBACK (gtk_scale_button_popup_from_bindings),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ g_signal_new_class_handler (I_("popup"),
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_CALLBACK (gtk_scale_button_popup),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+ /**
+ * GtkScaleButton::popdown:
+ * @button: the object which received the signal
+ *
+ * The ::popdown signal is a
+ * keybinding signal
+ * which gets emitted to popdown the scale widget.
+ *
+ * The default binding for this signal is Escape.
+ *
+ * Since: 2.12
+ */
signals[POPDOWN] =
- _gtk_binding_signal_new (I_("popdown"),
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_CALLBACK (gtk_scale_button_popdown_from_bindings),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ g_signal_new_class_handler (I_("popdown"),
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_CALLBACK (gtk_scale_button_popdown),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/* Key bindings */
binding_set = gtk_binding_set_by_class (widget_class);
- gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0,
"popup", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0,
"popup", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0,
"popup", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0,
"popup", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0,
+ "popup", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
"popdown", 0);
+
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SCALE_BUTTON_ACCESSIBLE);
}
static void
gtk_scale_button_init (GtkScaleButton *button)
{
- GtkWidget *frame, *box;
GtkScaleButtonPrivate *priv;
+ GtkWidget *frame;
- button->priv = g_new0 (GtkScaleButtonPrivate, 1);
- priv = button->priv;
+ button->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (button,
+ GTK_TYPE_SCALE_BUTTON,
+ GtkScaleButtonPrivate);
priv->timeout = FALSE;
priv->click_id = 0;
priv->click_timeout = CLICK_TIMEOUT;
+ priv->orientation = GTK_ORIENTATION_VERTICAL;
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
@@ -288,6 +373,7 @@ gtk_scale_button_init (GtkScaleButton *button)
/* window */
priv->dock = gtk_window_new (GTK_WINDOW_POPUP);
+ gtk_widget_set_name (priv->dock, "gtk-scalebutton-popup-window");
g_signal_connect (priv->dock, "button-press-event",
G_CALLBACK (cb_dock_button_press), button);
g_signal_connect (priv->dock, "key-release-event",
@@ -302,39 +388,59 @@ gtk_scale_button_init (GtkScaleButton *button)
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
gtk_container_add (GTK_CONTAINER (priv->dock), frame);
- box = gtk_vbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (frame), box);
+
+ /* box for scale and +/- buttons */
+ priv->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_container_add (GTK_CONTAINER (frame), priv->box);
/* + */
- button->plus_button = gtk_button_new_with_label ("+");
- gtk_button_set_relief (GTK_BUTTON (button->plus_button), GTK_RELIEF_NONE);
- g_signal_connect (button->plus_button, "button-press-event",
+ priv->plus_button = gtk_button_new_with_label ("+");
+ gtk_button_set_relief (GTK_BUTTON (priv->plus_button), GTK_RELIEF_NONE);
+ g_signal_connect (priv->plus_button, "button-press-event",
G_CALLBACK (cb_button_press), button);
- g_signal_connect (button->plus_button, "button-release-event",
+ g_signal_connect (priv->plus_button, "button-release-event",
G_CALLBACK (cb_button_release), button);
- gtk_box_pack_start (GTK_BOX (box), button->plus_button, TRUE, FALSE, 0);
-
- /* scale */
- priv->scale = gtk_scale_button_scale_new (button, 0., 100., 2.);
- gtk_widget_set_size_request (priv->scale, -1, SCALE_SIZE);
- gtk_scale_set_draw_value (GTK_SCALE (priv->scale), FALSE);
- gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE);
- gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, FALSE, 0);
- g_signal_connect (priv->scale, "grab-notify",
- G_CALLBACK (cb_scale_grab_notify), button);
+ gtk_box_pack_start (GTK_BOX (priv->box), priv->plus_button, FALSE, FALSE, 0);
/* - */
- button->minus_button = gtk_button_new_with_label ("-");
- gtk_button_set_relief (GTK_BUTTON (button->minus_button), GTK_RELIEF_NONE);
- g_signal_connect (button->minus_button, "button-press-event",
+ priv->minus_button = gtk_button_new_with_label ("-");
+ gtk_button_set_relief (GTK_BUTTON (priv->minus_button), GTK_RELIEF_NONE);
+ g_signal_connect (priv->minus_button, "button-press-event",
G_CALLBACK (cb_button_press), button);
- g_signal_connect (button->minus_button, "button-release-event",
+ g_signal_connect (priv->minus_button, "button-release-event",
G_CALLBACK (cb_button_release), button);
- gtk_box_pack_start (GTK_BOX (box), button->minus_button, TRUE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (priv->box), priv->minus_button, FALSE, FALSE, 0);
+
+ priv->adjustment = gtk_adjustment_new (0.0, 0.0, 100.0, 2, 20, 0);
+ g_object_ref_sink (priv->adjustment);
+
+ /* the scale */
+ priv->scale = gtk_scale_button_scale_new (button);
+ gtk_container_add (GTK_CONTAINER (priv->box), priv->scale);
+
+ gtk_widget_add_events (GTK_WIDGET (button), GDK_SCROLL_MASK);
+}
+
+static GObject *
+gtk_scale_button_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_params)
+{
+ GObject *object;
+ GtkScaleButton *button;
+ GtkScaleButtonPrivate *priv;
+
+ object = G_OBJECT_CLASS (gtk_scale_button_parent_class)->constructor (type, n_construct_properties, construct_params);
+
+ button = GTK_SCALE_BUTTON (object);
+
+ priv = button->priv;
/* set button text and size */
priv->size = GTK_ICON_SIZE_SMALL_TOOLBAR;
gtk_scale_button_update_icon (button);
+
+ return object;
}
static void
@@ -343,12 +449,13 @@ gtk_scale_button_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- GtkScaleButton *button;
-
- button = GTK_SCALE_BUTTON (object);
+ GtkScaleButton *button = GTK_SCALE_BUTTON (object);
switch (prop_id)
{
+ case PROP_ORIENTATION:
+ gtk_scale_button_set_orientation_private (button, g_value_get_enum (value));
+ break;
case PROP_VALUE:
gtk_scale_button_set_value (button, g_value_get_double (value));
break;
@@ -367,7 +474,7 @@ gtk_scale_button_set_property (GObject *object,
gtk_scale_button_set_adjustment (button, g_value_get_object (value));
break;
case PROP_ICONS:
- gtk_scale_button_set_icons (button,
+ gtk_scale_button_set_icons (button,
(const gchar **)g_value_get_boxed (value));
break;
default:
@@ -376,22 +483,22 @@ gtk_scale_button_set_property (GObject *object,
}
}
-static void
+static void
gtk_scale_button_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- GtkScaleButton *button;
- GtkScaleButtonPrivate *priv;
-
- button = GTK_SCALE_BUTTON (object);
- priv = button->priv;
+ GtkScaleButton *button = GTK_SCALE_BUTTON (object);
+ GtkScaleButtonPrivate *priv = button->priv;
switch (prop_id)
{
+ case PROP_ORIENTATION:
+ g_value_set_enum (value, priv->orientation);
+ break;
case PROP_VALUE:
- g_value_set_float (value, gtk_scale_button_get_value (button));
+ g_value_set_double (value, gtk_scale_button_get_value (button));
break;
case PROP_SIZE:
g_value_set_enum (value, priv->size);
@@ -409,48 +516,57 @@ gtk_scale_button_get_property (GObject *object,
}
static void
-gtk_scale_button_dispose (GObject *object)
+gtk_scale_button_finalize (GObject *object)
{
- GtkScaleButton *button;
- GtkScaleButtonPrivate *priv;
+ GtkScaleButton *button = GTK_SCALE_BUTTON (object);
+ GtkScaleButtonPrivate *priv = button->priv;
- button = GTK_SCALE_BUTTON (object);
+ if (priv->icon_list)
+ {
+ g_strfreev (priv->icon_list);
+ priv->icon_list = NULL;
+ }
- priv = button->priv;
+ if (priv->adjustment)
+ {
+ g_object_unref (priv->adjustment);
+ priv->adjustment = NULL;
+ }
+
+ G_OBJECT_CLASS (gtk_scale_button_parent_class)->finalize (object);
+}
- if (priv && priv->dock)
+static void
+gtk_scale_button_dispose (GObject *object)
+{
+ GtkScaleButton *button = GTK_SCALE_BUTTON (object);
+ GtkScaleButtonPrivate *priv = button->priv;
+
+ if (priv->dock)
{
gtk_widget_destroy (priv->dock);
priv->dock = NULL;
}
- if (priv && priv->click_id != 0)
+ if (priv->click_id != 0)
{
g_source_remove (priv->click_id);
priv->click_id = 0;
}
- if (priv && priv->icon_list)
- {
- g_strfreev (priv->icon_list);
- priv->icon_list = NULL;
- }
-
- g_free (priv);
- button->priv = NULL;
-
- G_OBJECT_CLASS (parent_class)->dispose (object);
+ G_OBJECT_CLASS (gtk_scale_button_parent_class)->dispose (object);
}
/**
- * gtk_scale_button_new
- * @size: a stock icon size
+ * gtk_scale_button_new:
+ * @size: (type int): a stock icon size
* @min: the minimum value of the scale (usually 0)
* @max: the maximum value of the scale (usually 100)
* @step: the stepping of value when a scroll-wheel event,
* or up/down arrow event occurs (usually 2)
- * @icons: a %NULL-terminated array of icon names, or %NULL if
- * you want to set the list later with gtk_scale_button_set_icons()
+ * @icons: (allow-none) (array zero-terminated=1): a %NULL-terminated
+ * array of icon names, or %NULL if you want to set the list
+ * later with gtk_scale_button_set_icons()
*
* Creates a #GtkScaleButton, with a range between @min and @max, with
* a stepping of @step.
@@ -467,12 +583,12 @@ gtk_scale_button_new (GtkIconSize size,
const gchar **icons)
{
GtkScaleButton *button;
- GtkObject *adj;
+ GtkAdjustment *adjustment;
+
+ adjustment = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
- adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
-
- button = g_object_new (GTK_TYPE_SCALE_BUTTON,
- "adjustment", adj,
+ button = g_object_new (GTK_TYPE_SCALE_BUTTON,
+ "adjustment", adjustment,
"icons", icons,
"size", size,
NULL);
@@ -481,7 +597,7 @@ gtk_scale_button_new (GtkIconSize size,
}
/**
- * gtk_scale_button_get_value
+ * gtk_scale_button_get_value:
* @button: a #GtkScaleButton
*
* Gets the current value of the scale button.
@@ -499,17 +615,17 @@ gtk_scale_button_get_value (GtkScaleButton * button)
priv = button->priv;
- return gtk_range_get_value (GTK_RANGE (priv->scale));
+ return gtk_adjustment_get_value (priv->adjustment);
}
/**
- * gtk_scale_button_set_value
+ * gtk_scale_button_set_value:
* @button: a #GtkScaleButton
* @value: new value of the scale button
*
- * Sets the current value of the scale; if the value is outside
- * the minimum or maximum range values, it will be clamped to fit
- * inside them. The scale button emits the #GtkScaleButton::value-changed
+ * Sets the current value of the scale; if the value is outside
+ * the minimum or maximum range values, it will be clamped to fit
+ * inside them. The scale button emits the #GtkScaleButton::value-changed
* signal if the value changes.
*
* Since: 2.12
@@ -528,14 +644,14 @@ gtk_scale_button_set_value (GtkScaleButton *button,
}
/**
- * gtk_scale_button_set_icons
+ * gtk_scale_button_set_icons:
* @button: a #GtkScaleButton
- * @icons: a %NULL-terminated array of icon names
+ * @icons: (array zero-terminated=1): a %NULL-terminated array of icon names
*
- * Sets the icons to be used by the scale button.
+ * Sets the icons to be used by the scale button.
* For details, see the #GtkScaleButton:icons property.
*
- * Since 2.12
+ * Since: 2.12
*/
void
gtk_scale_button_set_icons (GtkScaleButton *button,
@@ -563,29 +679,24 @@ gtk_scale_button_set_icons (GtkScaleButton *button,
* Gets the #GtkAdjustment associated with the #GtkScaleButton's scale.
* See gtk_range_get_adjustment() for details.
*
- * Returns: the adjustment associated with the scale
+ * Returns: (transfer none): the adjustment associated with the scale
*
* Since: 2.12
*/
GtkAdjustment*
gtk_scale_button_get_adjustment (GtkScaleButton *button)
{
- GtkRange *range;
-
g_return_val_if_fail (GTK_IS_SCALE_BUTTON (button), NULL);
- range = GTK_RANGE (button->priv->scale);
- g_return_val_if_fail (range != NULL, NULL);
-
- return gtk_range_get_adjustment (range);
+ return button->priv->adjustment;
}
/**
- * gtk_scale_button_set_adjustment
+ * gtk_scale_button_set_adjustment:
* @button: a #GtkScaleButton
* @adjustment: a #GtkAdjustment
*
- * Sets the #GtkAdjustment to be used as a model
+ * Sets the #GtkAdjustment to be used as a model
* for the #GtkScaleButton's scale.
* See gtk_range_set_adjustment() for details.
*
@@ -596,12 +707,127 @@ gtk_scale_button_set_adjustment (GtkScaleButton *button,
GtkAdjustment *adjustment)
{
g_return_if_fail (GTK_IS_SCALE_BUTTON (button));
- g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
- gtk_range_set_adjustment (GTK_RANGE (button->priv->scale),
- adjustment);
+ if (!adjustment)
+ 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 (button->priv->adjustment != adjustment)
+ {
+ if (button->priv->adjustment)
+ g_object_unref (button->priv->adjustment);
+ button->priv->adjustment = g_object_ref_sink (adjustment);
- g_object_notify (G_OBJECT (button), "adjustment");
+ if (button->priv->scale)
+ gtk_range_set_adjustment (GTK_RANGE (button->priv->scale), adjustment);
+
+ g_object_notify (G_OBJECT (button), "adjustment");
+ }
+}
+
+/**
+ * gtk_scale_button_get_plus_button:
+ * @button: a #GtkScaleButton
+ *
+ * Retrieves the plus button of the #GtkScaleButton.
+ *
+ * Returns: (transfer none): the plus button of the #GtkScaleButton
+ *
+ * Since: 2.14
+ */
+GtkWidget *
+gtk_scale_button_get_plus_button (GtkScaleButton *button)
+{
+ g_return_val_if_fail (GTK_IS_SCALE_BUTTON (button), NULL);
+
+ return button->priv->plus_button;
+}
+
+/**
+ * gtk_scale_button_get_minus_button:
+ * @button: a #GtkScaleButton
+ *
+ * Retrieves the minus button of the #GtkScaleButton.
+ *
+ * Returns: (transfer none): the minus button of the #GtkScaleButton
+ *
+ * Since: 2.14
+ */
+GtkWidget *
+gtk_scale_button_get_minus_button (GtkScaleButton *button)
+{
+ g_return_val_if_fail (GTK_IS_SCALE_BUTTON (button), NULL);
+
+ return button->priv->minus_button;
+}
+
+/**
+ * gtk_scale_button_get_popup:
+ * @button: a #GtkScaleButton
+ *
+ * Retrieves the popup of the #GtkScaleButton.
+ *
+ * Returns: (transfer none): the popup of the #GtkScaleButton
+ *
+ * Since: 2.14
+ */
+GtkWidget *
+gtk_scale_button_get_popup (GtkScaleButton *button)
+{
+ g_return_val_if_fail (GTK_IS_SCALE_BUTTON (button), NULL);
+
+ return button->priv->dock;
+}
+
+static void
+gtk_scale_button_set_orientation_private (GtkScaleButton *button,
+ GtkOrientation orientation)
+{
+ GtkScaleButtonPrivate *priv = button->priv;
+
+ if (orientation != priv->orientation)
+ {
+ priv->orientation = orientation;
+
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box),
+ orientation);
+ gtk_container_child_set (GTK_CONTAINER (priv->box),
+ priv->plus_button,
+ "pack-type",
+ orientation == GTK_ORIENTATION_VERTICAL ?
+ GTK_PACK_START : GTK_PACK_END,
+ NULL);
+ gtk_container_child_set (GTK_CONTAINER (priv->box),
+ priv->minus_button,
+ "pack-type",
+ orientation == GTK_ORIENTATION_VERTICAL ?
+ GTK_PACK_END : GTK_PACK_START,
+ NULL);
+
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->scale),
+ orientation);
+
+ if (orientation == GTK_ORIENTATION_VERTICAL)
+ {
+ gtk_widget_set_size_request (GTK_WIDGET (priv->scale),
+ -1, SCALE_SIZE);
+ gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE);
+ }
+ else
+ {
+ gtk_widget_set_size_request (GTK_WIDGET (priv->scale),
+ SCALE_SIZE, -1);
+ gtk_range_set_inverted (GTK_RANGE (priv->scale), FALSE);
+ }
+
+ /* FIXME: without this, the popup window appears as a square
+ * after changing the orientation
+ */
+ gtk_window_resize (GTK_WINDOW (priv->dock), 1, 1);
+
+ g_object_notify (G_OBJECT (button), "orientation");
+ }
}
/*
@@ -614,12 +840,12 @@ gtk_scale_button_scroll (GtkWidget *widget,
{
GtkScaleButton *button;
GtkScaleButtonPrivate *priv;
- GtkAdjustment *adj;
+ GtkAdjustment *adjustment;
gdouble d;
button = GTK_SCALE_BUTTON (widget);
priv = button->priv;
- adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale));
+ adjustment = priv->adjustment;
if (event->type != GDK_SCROLL)
return FALSE;
@@ -627,15 +853,15 @@ gtk_scale_button_scroll (GtkWidget *widget,
d = gtk_scale_button_get_value (button);
if (event->direction == GDK_SCROLL_UP)
{
- d += adj->step_increment;
- if (d > adj->upper)
- d = adj->upper;
+ d += gtk_adjustment_get_step_increment (adjustment);
+ if (d > gtk_adjustment_get_upper (adjustment))
+ d = gtk_adjustment_get_upper (adjustment);
}
else
{
- d -= adj->step_increment;
- if (d < adj->lower)
- d = adj->lower;
+ d -= gtk_adjustment_get_step_increment (adjustment);
+ if (d < gtk_adjustment_get_lower (adjustment))
+ d = gtk_adjustment_get_lower (adjustment);
}
gtk_scale_button_set_value (button, d);
@@ -649,7 +875,7 @@ gtk_scale_button_screen_changed (GtkWidget *widget,
GtkScaleButton *button = (GtkScaleButton *) widget;
GtkScaleButtonPrivate *priv;
GdkScreen *screen;
- GValue value = { 0, };
+ GValue value = G_VALUE_INIT;
if (gtk_widget_has_screen (widget) == FALSE)
return;
@@ -674,48 +900,84 @@ gtk_scale_popup (GtkWidget *widget,
GdkEvent *event,
guint32 time)
{
+ GtkAllocation allocation, dock_allocation, scale_allocation;
GtkScaleButton *button;
GtkScaleButtonPrivate *priv;
- GtkAdjustment *adj;
- gint x, y, m, dx, dy, sx, sy, ystartoff;
+ GtkAdjustment *adjustment;
+ gint x, y, m, dx, dy, sx, sy, startoff;
+ gint min_slider_size;
gdouble v;
- GdkDisplay *display;
GdkScreen *screen;
+ gboolean is_moved;
+ GdkDevice *device, *keyboard, *pointer;
+ is_moved = FALSE;
button = GTK_SCALE_BUTTON (widget);
priv = button->priv;
- adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale));
+ adjustment = priv->adjustment;
- display = gtk_widget_get_display (widget);
screen = gtk_widget_get_screen (widget);
+ gtk_widget_get_allocation (widget, &allocation);
/* position roughly */
gtk_window_set_screen (GTK_WINDOW (priv->dock), screen);
- gdk_window_get_origin (widget->window, &x, &y);
- x += widget->allocation.x;
- y += widget->allocation.y;
- gtk_window_move (GTK_WINDOW (priv->dock), x, y - (SCALE_SIZE / 2));
+ gdk_window_get_origin (gtk_widget_get_window (widget),
+ &x, &y);
+ x += allocation.x;
+ y += allocation.y;
+
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+ gtk_window_move (GTK_WINDOW (priv->dock), x, y - (SCALE_SIZE / 2));
+ else
+ gtk_window_move (GTK_WINDOW (priv->dock), x - (SCALE_SIZE / 2), y);
+
gtk_widget_show_all (priv->dock);
- gdk_window_get_origin (priv->dock->window, &dx, &dy);
- dy += priv->dock->allocation.y;
- gdk_window_get_origin (priv->scale->window, &sx, &sy);
- sy += priv->scale->allocation.y;
- ystartoff = sy - dy;
+
+ gdk_window_get_origin (gtk_widget_get_window (priv->dock),
+ &dx, &dy);
+ gtk_widget_get_allocation (priv->dock, &dock_allocation);
+ dx += dock_allocation.x;
+ dy += dock_allocation.y;
+
+
+ gdk_window_get_origin (gtk_widget_get_window (priv->scale),
+ &sx, &sy);
+ gtk_widget_get_allocation (priv->scale, &scale_allocation);
+ sx += scale_allocation.x;
+ sy += scale_allocation.y;
+
priv->timeout = TRUE;
/* position (needs widget to be shown already) */
- v = gtk_scale_button_get_value (button) / (adj->upper - adj->lower);
- x += (widget->allocation.width - priv->dock->allocation.width) / 2;
- y -= ystartoff;
- y -= GTK_RANGE (priv->scale)->min_slider_size / 2;
- m = priv->scale->allocation.height -
- GTK_RANGE (priv->scale)->min_slider_size;
- y -= m * (1.0 - v);
+ v = gtk_scale_button_get_value (button) / (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment));
+ min_slider_size = gtk_range_get_min_slider_size (GTK_RANGE (priv->scale));
+
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+ {
+ startoff = sy - dy;
+
+ x += (allocation.width - dock_allocation.width) / 2;
+ y -= startoff;
+ y -= min_slider_size / 2;
+ m = scale_allocation.height - min_slider_size;
+ y -= m * (1.0 - v);
+ }
+ else
+ {
+ startoff = sx - dx;
+
+ x -= startoff;
+ y += (allocation.height - dock_allocation.height) / 2;
+ x -= min_slider_size / 2;
+ m = scale_allocation.width - min_slider_size;
+ x -= m * v;
+ }
/* Make sure the dock stays inside the monitor */
if (event->type == GDK_BUTTON_PRESS)
{
+ GtkAllocation d_allocation;
int monitor;
GdkEventButton *button_event = (GdkEventButton *) event;
GdkRectangle rect;
@@ -725,65 +987,114 @@ gtk_scale_popup (GtkWidget *widget,
monitor = gdk_screen_get_monitor_at_point (screen,
button_event->x_root,
button_event->y_root);
- gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+ gdk_screen_get_monitor_workarea (screen, monitor, &rect);
- y += button_event->y;
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+ y += button_event->y;
+ else
+ x += button_event->x;
+
+ /* Move the dock, but set is_moved so we
+ * don't forward the first click later on,
+ * as it could make the scale go to the bottom */
+ gtk_widget_get_allocation (d, &d_allocation);
if (y < rect.y)
- y = rect.y;
- else if (y + d->allocation.height > rect.height + rect.y)
- y = rect.y + rect.height - d->allocation.height;
+ {
+ y = rect.y;
+ is_moved = TRUE;
+ }
+ else if (y + d_allocation.height > rect.height + rect.y)
+ {
+ y = rect.y + rect.height - d_allocation.height;
+ is_moved = TRUE;
+ }
if (x < rect.x)
- x = rect.x;
- else if (x + d->allocation.width > rect.width + rect.x)
- x = rect.x + rect.width - d->allocation.width;
+ {
+ x = rect.x;
+ is_moved = TRUE;
+ }
+ else if (x + d_allocation.width > rect.width + rect.x)
+ {
+ x = rect.x + rect.width - d_allocation.width;
+ is_moved = TRUE;
+ }
}
gtk_window_move (GTK_WINDOW (priv->dock), x, y);
if (event->type == GDK_BUTTON_PRESS)
- GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, (GdkEventButton *) event);
+ GTK_WIDGET_CLASS (gtk_scale_button_parent_class)->button_press_event (widget, (GdkEventButton *) event);
+
+ device = gdk_event_get_device (event);
+
+ if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
+ {
+ keyboard = device;
+ pointer = gdk_device_get_associated_device (device);
+ }
+ else
+ {
+ pointer = device;
+ keyboard = gdk_device_get_associated_device (device);
+ }
/* grab focus */
- gtk_grab_add (priv->dock);
+ gtk_device_grab_add (priv->dock, pointer, TRUE);
- if (gdk_pointer_grab (priv->dock->window, TRUE,
- GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK, NULL, NULL, time)
- != GDK_GRAB_SUCCESS)
+ if (gdk_device_grab (pointer, gtk_widget_get_window (priv->dock),
+ GDK_OWNERSHIP_WINDOW, TRUE,
+ GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+ GDK_POINTER_MOTION_MASK, NULL, time) != GDK_GRAB_SUCCESS)
{
- gtk_grab_remove (priv->dock);
+ gtk_device_grab_remove (priv->dock, pointer);
gtk_widget_hide (priv->dock);
return FALSE;
}
- if (gdk_keyboard_grab (priv->dock->window, TRUE, time) != GDK_GRAB_SUCCESS)
+ if (gdk_device_grab (keyboard, gtk_widget_get_window (priv->dock),
+ GDK_OWNERSHIP_WINDOW, TRUE,
+ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
+ NULL, time) != GDK_GRAB_SUCCESS)
{
- gdk_display_pointer_ungrab (display, time);
- gtk_grab_remove (priv->dock);
+ gdk_device_ungrab (pointer, time);
+ gtk_device_grab_remove (priv->dock, pointer);
gtk_widget_hide (priv->dock);
return FALSE;
}
gtk_widget_grab_focus (priv->dock);
+ priv->grab_keyboard = keyboard;
+ priv->grab_pointer = pointer;
- if (event->type == GDK_BUTTON_PRESS)
+ if (event->type == GDK_BUTTON_PRESS && !is_moved)
{
GdkEventButton *e;
GdkEventButton *button_event = (GdkEventButton *) event;
/* forward event to the slider */
e = (GdkEventButton *) gdk_event_copy ((GdkEvent *) event);
- e->window = priv->scale->window;
+ e->window = gtk_widget_get_window (priv->scale);
/* position: the X position isn't relevant, halfway will work just fine.
* The vertical position should be *exactly* in the middle of the slider
* of the scale; if we don't do that correctly, it'll move from its current
- * position, which means a position change on-click, which is bad. */
- e->x = priv->scale->allocation.width / 2;
- m = priv->scale->allocation.height -
- GTK_RANGE (priv->scale)->min_slider_size;
- e->y = ((1.0 - v) * m) + GTK_RANGE (priv->scale)->min_slider_size / 2;
+ * position, which means a position change on-click, which is bad.
+ */
+ gtk_widget_get_allocation (priv->scale, &scale_allocation);
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+ {
+ e->x = scale_allocation.width / 2;
+ m = scale_allocation.height - min_slider_size;
+ e->y = ((1.0 - v) * m) + min_slider_size / 2;
+ }
+ else
+ {
+ e->y = scale_allocation.height / 2;
+ m = scale_allocation.width - min_slider_size;
+ e->x = (v * m) + min_slider_size / 2;
+ }
+
gtk_widget_event (priv->scale, (GdkEvent *) e);
e->window = button_event->window;
gdk_event_free ((GdkEvent *) e);
@@ -804,12 +1115,25 @@ gtk_scale_button_press (GtkWidget *widget,
}
static void
-gtk_scale_button_popup_from_bindings (GtkWidget *widget)
+gtk_scale_button_popup (GtkWidget *widget)
{
GdkEvent *ev;
- ev = gdk_event_new (GDK_KEY_RELEASE);
- gtk_scale_popup (widget, ev, GDK_CURRENT_TIME);
+ /* This is a callback for a keybinding signal,
+ * current event should be the key event that
+ * triggered it.
+ */
+ ev = gtk_get_current_event ();
+
+ if (ev->type != GDK_KEY_PRESS &&
+ ev->type != GDK_KEY_RELEASE)
+ {
+ gdk_event_free (ev);
+ ev = gdk_event_new (GDK_KEY_RELEASE);
+ ev->key.time = GDK_CURRENT_TIME;
+ }
+
+ gtk_scale_popup (widget, ev, ev->key.time);
gdk_event_free (ev);
}
@@ -817,30 +1141,44 @@ static gboolean
gtk_scale_button_key_release (GtkWidget *widget,
GdkEventKey *event)
{
- return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
+ return gtk_bindings_activate_event (G_OBJECT (widget), event);
}
/* This is called when the grab is broken for
* either the dock, or the scale itself */
static void
gtk_scale_button_grab_notify (GtkScaleButton *button,
- gboolean was_grabbed)
+ gboolean was_grabbed)
{
- GdkDisplay *display;
GtkScaleButtonPrivate *priv;
+ GtkWidget *toplevel, *grab_widget;
+ GtkWindowGroup *group;
- if (was_grabbed != FALSE)
+ priv = button->priv;
+
+ if (!priv->grab_pointer ||
+ !gtk_widget_device_is_shadowed (GTK_WIDGET (button), priv->grab_pointer))
return;
- priv = button->priv;
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
- if (gtk_widget_is_ancestor (gtk_grab_get_current (), priv->dock))
+ if (GTK_IS_WINDOW (toplevel))
+ group = gtk_window_get_group (GTK_WINDOW (toplevel));
+ else
+ group = gtk_window_get_group (NULL);
+
+ grab_widget = gtk_window_group_get_current_device_grab (group, priv->grab_pointer);
+
+ if (grab_widget &&
+ gtk_widget_is_ancestor (grab_widget, priv->dock))
return;
- display = gtk_widget_get_display (priv->dock);
- gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME);
- gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
- gtk_grab_remove (priv->dock);
+ gdk_device_ungrab (priv->grab_keyboard, GDK_CURRENT_TIME);
+ gdk_device_ungrab (priv->grab_pointer, GDK_CURRENT_TIME);
+ gtk_device_grab_remove (priv->dock, priv->grab_pointer);
+
+ priv->grab_keyboard = NULL;
+ priv->grab_pointer = NULL;
/* hide again */
gtk_widget_hide (priv->dock);
@@ -856,7 +1194,7 @@ cb_button_timeout (gpointer user_data)
{
GtkScaleButton *button;
GtkScaleButtonPrivate *priv;
- GtkAdjustment *adj;
+ GtkAdjustment *adjustment;
gdouble val;
gboolean res = TRUE;
@@ -866,19 +1204,19 @@ cb_button_timeout (gpointer user_data)
if (priv->click_id == 0)
return FALSE;
- adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale));
+ adjustment = priv->adjustment;
val = gtk_scale_button_get_value (button);
val += priv->direction;
- if (val <= adj->lower)
+ if (val <= gtk_adjustment_get_lower (adjustment))
{
res = FALSE;
- val = adj->lower;
+ val = gtk_adjustment_get_lower (adjustment);
}
- else if (val > adj->upper)
+ else if (val > gtk_adjustment_get_upper (adjustment))
{
res = FALSE;
- val = adj->upper;
+ val = gtk_adjustment_get_upper (adjustment);
}
gtk_scale_button_set_value (button, val);
@@ -898,22 +1236,23 @@ cb_button_press (GtkWidget *widget,
{
GtkScaleButton *button;
GtkScaleButtonPrivate *priv;
- GtkAdjustment *adj;
+ GtkAdjustment *adjustment;
button = GTK_SCALE_BUTTON (user_data);
priv = button->priv;
- adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale));
+ adjustment = priv->adjustment;
if (priv->click_id != 0)
g_source_remove (priv->click_id);
- if (widget == button->plus_button)
- priv->direction = fabs (adj->page_increment);
+ if (widget == priv->plus_button)
+ priv->direction = fabs (gtk_adjustment_get_page_increment (adjustment));
else
- priv->direction = - fabs (adj->page_increment);
+ priv->direction = - fabs (gtk_adjustment_get_page_increment (adjustment));
- priv->click_id = g_timeout_add (priv->click_timeout,
- (GSourceFunc) cb_button_timeout, button);
+ priv->click_id = gdk_threads_add_timeout (priv->click_timeout,
+ cb_button_timeout,
+ button);
cb_button_timeout (button);
return TRUE;
@@ -951,7 +1290,7 @@ cb_dock_grab_notify (GtkWidget *widget,
static gboolean
cb_dock_grab_broken_event (GtkWidget *widget,
- gboolean was_grabbed,
+ gboolean was_grabbed,
gpointer user_data)
{
GtkScaleButton *button = (GtkScaleButton *) user_data;
@@ -961,32 +1300,31 @@ cb_dock_grab_broken_event (GtkWidget *widget,
return FALSE;
}
-/*
- * Scale callbacks.
- */
+/* Scale callbacks */
static void
gtk_scale_button_release_grab (GtkScaleButton *button,
- GdkEventButton *event)
+ GdkEventButton *event)
{
GdkEventButton *e;
- GdkDisplay *display;
GtkScaleButtonPrivate *priv;
priv = button->priv;
/* ungrab focus */
- display = gtk_widget_get_display (GTK_WIDGET (button));
- gdk_display_keyboard_ungrab (display, event->time);
- gdk_display_pointer_ungrab (display, event->time);
- gtk_grab_remove (priv->dock);
+ gdk_device_ungrab (priv->grab_keyboard, event->time);
+ gdk_device_ungrab (priv->grab_pointer, event->time);
+ gtk_device_grab_remove (priv->dock, priv->grab_pointer);
+
+ priv->grab_keyboard = NULL;
+ priv->grab_pointer = NULL;
/* hide again */
gtk_widget_hide (priv->dock);
priv->timeout = FALSE;
e = (GdkEventButton *) gdk_event_copy ((GdkEvent *) event);
- e->window = GTK_WIDGET (button)->window;
+ e->window = gtk_widget_get_window (GTK_WIDGET (button));
e->type = GDK_BUTTON_RELEASE;
gtk_widget_event (GTK_WIDGET (button), (GdkEvent *) e);
e->window = event->window;
@@ -1010,20 +1348,21 @@ cb_dock_button_press (GtkWidget *widget,
}
static void
-gtk_scale_button_popdown_from_bindings (GtkWidget *widget)
+gtk_scale_button_popdown (GtkWidget *widget)
{
GtkScaleButton *button;
GtkScaleButtonPrivate *priv;
- GdkDisplay *display;
button = GTK_SCALE_BUTTON (widget);
priv = button->priv;
/* ungrab focus */
- display = gtk_widget_get_display (widget);
- gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME);
- gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
- gtk_grab_remove (priv->dock);
+ gdk_device_ungrab (priv->grab_keyboard, GDK_CURRENT_TIME);
+ gdk_device_ungrab (priv->grab_pointer, GDK_CURRENT_TIME);
+ gtk_device_grab_remove (priv->dock, priv->grab_pointer);
+
+ priv->grab_keyboard = NULL;
+ priv->grab_pointer = NULL;
/* hide again */
gtk_widget_hide (priv->dock);
@@ -1035,16 +1374,16 @@ cb_dock_key_release (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
- if (event->keyval == GDK_Escape)
+ if (event->keyval == GDK_KEY_Escape)
{
- gtk_scale_button_popdown_from_bindings (GTK_WIDGET (user_data));
+ gtk_scale_button_popdown (GTK_WIDGET (user_data));
return TRUE;
}
- if (!gtk_bindings_activate_event (GTK_OBJECT (widget), event))
+ if (!gtk_bindings_activate_event (G_OBJECT (widget), event))
{
/* The popup hasn't managed the event, pass onto the button */
- gtk_bindings_activate_event (GTK_OBJECT (user_data), event);
+ gtk_bindings_activate_event (G_OBJECT (user_data), event);
}
return TRUE;
@@ -1064,66 +1403,74 @@ cb_scale_grab_notify (GtkWidget *widget,
* Scale stuff.
*/
-#define GTK_TYPE_SCALE_BUTTON_SCALE \
- (gtk_scale_button_scale_get_type ())
-#define GTK_SCALE_BUTTON_SCALE(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON_SCALE, \
- GtkScaleButtonScale))
+#define GTK_TYPE_SCALE_BUTTON_SCALE (_gtk_scale_button_scale_get_type ())
+#define GTK_SCALE_BUTTON_SCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON_SCALE, GtkScaleButtonScale))
+#define GTK_IS_SCALE_BUTTON_SCALE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_BUTTON_SCALE))
-typedef struct _GtkScaleButtonScaleClass {
- GtkVScaleClass parent_class;
-} GtkScaleButtonScaleClass;
-
-typedef struct _GtkScaleButtonScale {
- GtkVScale parent;
+typedef struct _GtkScaleButtonScale
+{
+ GtkScale parent_instance;
GtkScaleButton *button;
} GtkScaleButtonScale;
-static GType gtk_scale_button_scale_get_type (void);
-static void gtk_scale_button_scale_class_init (GtkScaleButtonScaleClass *klass);
-static gboolean gtk_scale_button_scale_press (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean gtk_scale_button_scale_release (GtkWidget *widget,
- GdkEventButton *event);
+typedef struct _GtkScaleButtonScaleClass
+{
+ GtkScaleClass parent_class;
+} GtkScaleButtonScaleClass;
+
+static gboolean gtk_scale_button_scale_press (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean gtk_scale_button_scale_release (GtkWidget *widget,
+ GdkEventButton *event);
-static GtkVScaleClass *scale_parent_class = NULL;
+GType _gtk_scale_button_scale_get_type (void);
-G_DEFINE_TYPE (GtkScaleButtonScale, gtk_scale_button_scale, GTK_TYPE_VSCALE)
+G_DEFINE_TYPE (GtkScaleButtonScale, _gtk_scale_button_scale, GTK_TYPE_SCALE)
static void
-gtk_scale_button_scale_class_init (GtkScaleButtonScaleClass *klass)
+_gtk_scale_button_scale_class_init (GtkScaleButtonScaleClass *klass)
{
GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS (klass);
GtkRangeClass *gtkrange_class = GTK_RANGE_CLASS (klass);
- scale_parent_class = g_type_class_peek_parent (klass);
-
gtkwidget_class->button_press_event = gtk_scale_button_scale_press;
gtkwidget_class->button_release_event = gtk_scale_button_scale_release;
gtkrange_class->value_changed = gtk_scale_button_scale_value_changed;
}
static void
-gtk_scale_button_scale_init (GtkScaleButtonScale *scale)
+_gtk_scale_button_scale_init (GtkScaleButtonScale *scale)
{
}
static GtkWidget *
-gtk_scale_button_scale_new (GtkScaleButton *button,
- gdouble min,
- gdouble max,
- gdouble step)
+gtk_scale_button_scale_new (GtkScaleButton *button)
{
+ GtkScaleButtonPrivate *priv = button->priv;
GtkScaleButtonScale *scale;
- GtkScaleButtonPrivate *priv;
- GtkObject *adj;
- priv = button->priv;
- scale = g_object_new (GTK_TYPE_SCALE_BUTTON_SCALE, NULL);
- adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
- gtk_range_set_adjustment (GTK_RANGE (scale), GTK_ADJUSTMENT (adj));
+ scale = g_object_new (GTK_TYPE_SCALE_BUTTON_SCALE,
+ "orientation", priv->orientation,
+ "adjustment", priv->adjustment,
+ "draw-value", FALSE,
+ NULL);
+
scale->button = button;
+ g_signal_connect (scale, "grab-notify",
+ G_CALLBACK (cb_scale_grab_notify), button);
+
+ if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+ {
+ gtk_widget_set_size_request (GTK_WIDGET (scale), -1, SCALE_SIZE);
+ gtk_range_set_inverted (GTK_RANGE (scale), TRUE);
+ }
+ else
+ {
+ gtk_widget_set_size_request (GTK_WIDGET (scale), SCALE_SIZE, -1);
+ gtk_range_set_inverted (GTK_RANGE (scale), FALSE);
+ }
+
return GTK_WIDGET (scale);
}
@@ -1131,50 +1478,47 @@ static gboolean
gtk_scale_button_scale_press (GtkWidget *widget,
GdkEventButton *event)
{
- GtkScaleButtonScale *scale;
- GtkScaleButtonPrivate *priv;
-
- scale = GTK_SCALE_BUTTON_SCALE (widget);
- priv = scale->button->priv;
+ GtkScaleButtonPrivate *priv = GTK_SCALE_BUTTON_SCALE (widget)->button->priv;
/* the scale will grab input; if we have input grabbed, all goes
- * horribly wrong, so let's not do that. */
- gtk_grab_remove (priv->dock);
+ * horribly wrong, so let's not do that.
+ */
+ gtk_device_grab_remove (priv->dock, event->device);
- return GTK_WIDGET_CLASS (scale_parent_class)->button_press_event (widget, event);
+ return GTK_WIDGET_CLASS (_gtk_scale_button_scale_parent_class)->button_press_event (widget, event);
}
static gboolean
gtk_scale_button_scale_release (GtkWidget *widget,
GdkEventButton *event)
{
- GtkScaleButtonScale *scale;
- GtkScaleButtonPrivate *priv;
+ GtkScaleButton *button = GTK_SCALE_BUTTON_SCALE (widget)->button;
gboolean res;
- scale = GTK_SCALE_BUTTON_SCALE (widget);
- priv = scale->button->priv;
-
- if (priv->timeout)
+ if (button->priv->timeout)
{
/* if we did a quick click, leave the window open; else, hide it */
- if (event->time > priv->pop_time + priv->click_timeout)
+ if (event->time > button->priv->pop_time + button->priv->click_timeout)
{
- gtk_scale_button_release_grab (scale->button, event);
- GTK_WIDGET_CLASS (scale_parent_class)->button_release_event (widget, event);
+
+ gtk_scale_button_release_grab (button, event);
+ GTK_WIDGET_CLASS (_gtk_scale_button_scale_parent_class)->button_release_event (widget, event);
+
return TRUE;
}
- priv->timeout = FALSE;
+
+ button->priv->timeout = FALSE;
}
- res = GTK_WIDGET_CLASS (scale_parent_class)->button_release_event (widget, event);
+ res = GTK_WIDGET_CLASS (_gtk_scale_button_scale_parent_class)->button_release_event (widget, event);
/* the scale will release input; right after that, we *have to* grab
* it back so we can catch out-of-scale clicks and hide the popup,
* so I basically want a g_signal_connect_after_always(), but I can't
* find that, so we do this complex 'first-call-parent-then-do-actual-
- * action' thingy... */
- gtk_grab_add (priv->dock);
+ * action' thingy...
+ */
+ gtk_device_grab_add (button->priv->dock, event->device, TRUE);
return res;
}
@@ -1183,59 +1527,58 @@ static void
gtk_scale_button_update_icon (GtkScaleButton *button)
{
GtkScaleButtonPrivate *priv;
- GtkRange *range;
- GtkAdjustment *adj;
+ GtkAdjustment *adjustment;
gdouble value;
const gchar *name;
guint num_icons;
priv = button->priv;
- if (priv->icon_list == NULL || priv->icon_list[0] == NULL)
+ if (!priv->icon_list || priv->icon_list[0] == '\0')
{
gtk_image_set_from_stock (GTK_IMAGE (priv->image),
- GTK_STOCK_MISSING_IMAGE,
- priv->size);
+ GTK_STOCK_MISSING_IMAGE,
+ priv->size);
return;
}
- for (num_icons = 0; priv->icon_list[num_icons] != NULL; num_icons++) {}
+ num_icons = g_strv_length (priv->icon_list);
/* The 1-icon special case */
if (num_icons == 1)
{
gtk_image_set_from_icon_name (GTK_IMAGE (priv->image),
- priv->icon_list[0],
- priv->size);
+ priv->icon_list[0],
+ priv->size);
return;
}
- range = GTK_RANGE (priv->scale);
- adj = gtk_range_get_adjustment (range);
+ adjustment = priv->adjustment;
value = gtk_scale_button_get_value (button);
/* The 2-icons special case */
if (num_icons == 2)
{
gdouble limit;
- limit = (adj->upper - adj->lower) / 2 + adj->lower;
+
+ limit = (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) / 2 + gtk_adjustment_get_lower (adjustment);
if (value < limit)
- name = priv->icon_list[0];
+ name = priv->icon_list[0];
else
- name = priv->icon_list[1];
+ name = priv->icon_list[1];
gtk_image_set_from_icon_name (GTK_IMAGE (priv->image),
- name,
- priv->size);
+ name,
+ priv->size);
return;
}
/* With 3 or more icons */
- if (value == adj->lower)
+ if (value == gtk_adjustment_get_lower (adjustment))
{
name = priv->icon_list[0];
}
- else if (value == adj->upper)
+ else if (value == gtk_adjustment_get_upper (adjustment))
{
name = priv->icon_list[1];
}
@@ -1244,22 +1587,21 @@ gtk_scale_button_update_icon (GtkScaleButton *button)
gdouble step;
guint i;
- step = (adj->upper - adj->lower) / (num_icons - 2);
- i = (guint) (value - adj->lower) / step + 2;
+ step = (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) / (num_icons - 2);
+ i = (guint) ((value - gtk_adjustment_get_lower (adjustment)) / step) + 2;
g_assert (i < num_icons);
name = priv->icon_list[i];
}
gtk_image_set_from_icon_name (GTK_IMAGE (priv->image),
- name,
- priv->size);
+ name,
+ priv->size);
}
static void
gtk_scale_button_scale_value_changed (GtkRange *range)
{
- GtkScaleButtonScale *scale = GTK_SCALE_BUTTON_SCALE (range);
- GtkScaleButton *button = scale->button;
+ GtkScaleButton *button = GTK_SCALE_BUTTON_SCALE (range)->button;
gdouble value;
value = gtk_range_get_value (range);
@@ -1269,7 +1611,3 @@ gtk_scale_button_scale_value_changed (GtkRange *range)
g_signal_emit (button, signals[VALUE_CHANGED], 0, value);
g_object_notify (G_OBJECT (button), "value");
}
-
-
-#define __GTK_SCALE_BUTTON_C__
-#include "gtkaliasdef.c"