#include <string.h>
#include <locale.h>
#include "gdk/gdkkeysyms.h"
+#include "gtkbindings.h"
#include "gtkspinbutton.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#define MAX_TIMER_CALLS 5
#define EPSILON 1e-10
#define MAX_DIGITS 20
+#define MIN_ARROW_WIDTH 6
enum {
PROP_0,
INPUT,
OUTPUT,
VALUE_CHANGED,
+ CHANGE_VALUE,
LAST_SIGNAL
};
GdkEventFocus *event);
static void gtk_spin_button_grab_notify (GtkWidget *widget,
gboolean was_grabbed);
+static void gtk_spin_button_state_changed (GtkWidget *widget,
+ GtkStateType previous_state);
static void gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
- guint arrow);
+ GtkArrowType arrow_type);
static gint gtk_spin_button_timer (GtkSpinButton *spin_button);
static void gtk_spin_button_stop_spinning (GtkSpinButton *spin);
static void gtk_spin_button_value_changed (GtkAdjustment *adjustment,
GtkSpinButton *spin_button);
-static gint gtk_spin_button_key_press (GtkWidget *widget,
- GdkEventKey *event);
static gint gtk_spin_button_key_release (GtkWidget *widget,
GdkEventKey *event);
static gint gtk_spin_button_scroll (GtkWidget *widget,
gint *position);
static void gtk_spin_button_real_spin (GtkSpinButton *spin_button,
gdouble step);
+static void gtk_spin_button_real_change_value (GtkSpinButton *spin,
+ GtkScrollType scroll);
+
static gint gtk_spin_button_default_input (GtkSpinButton *spin_button,
gdouble *new_val);
static gint gtk_spin_button_default_output (GtkSpinButton *spin_button);
+
static gint spin_button_get_arrow_size (GtkSpinButton *spin_button);
static gint spin_button_get_shadow_type (GtkSpinButton *spin_button);
+static void spin_button_redraw (GtkSpinButton *spin_button);
static GtkEntryClass *parent_class = NULL;
static guint spinbutton_signals[LAST_SIGNAL] = {0};
+#define NO_ARROW 2
GtkType
gtk_spin_button_get_type (void)
return spin_button_type;
}
+#define add_spin_binding(binding_set, keyval, mask, scroll) \
+ gtk_binding_entry_add_signal (binding_set, keyval, mask, \
+ "change_value", 1, \
+ GTK_TYPE_SCROLL_TYPE, scroll)
+
static void
gtk_spin_button_class_init (GtkSpinButtonClass *class)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkEntryClass *entry_class;
+ GtkBindingSet *binding_set;
object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
widget_class->button_press_event = gtk_spin_button_button_press;
widget_class->button_release_event = gtk_spin_button_button_release;
widget_class->motion_notify_event = gtk_spin_button_motion_notify;
- widget_class->key_press_event = gtk_spin_button_key_press;
widget_class->key_release_event = gtk_spin_button_key_release;
widget_class->enter_notify_event = gtk_spin_button_enter_notify;
widget_class->leave_notify_event = gtk_spin_button_leave_notify;
widget_class->focus_out_event = gtk_spin_button_focus_out;
widget_class->grab_notify = gtk_spin_button_grab_notify;
+ widget_class->state_changed = gtk_spin_button_state_changed;
entry_class->activate = gtk_spin_button_activate;
class->input = NULL;
class->output = NULL;
+ class->change_value = gtk_spin_button_real_change_value;
g_object_class_install_property (gobject_class,
PROP_ADJUSTMENT,
GTK_SIGNAL_OFFSET (GtkSpinButtonClass, value_changed),
_gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
+
+ /* Action signals */
+ spinbutton_signals[CHANGE_VALUE] =
+ g_signal_new ("change_value",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkSpinButtonClass, change_value),
+ NULL, NULL,
+ _gtk_marshal_VOID__ENUM,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_SCROLL_TYPE);
+
+ binding_set = gtk_binding_set_by_class (class);
+
+ add_spin_binding (binding_set, GDK_Up, 0, GTK_SCROLL_STEP_UP);
+ add_spin_binding (binding_set, GDK_KP_Up, 0, GTK_SCROLL_STEP_UP);
+ add_spin_binding (binding_set, GDK_Down, 0, GTK_SCROLL_STEP_DOWN);
+ add_spin_binding (binding_set, GDK_KP_Down, 0, GTK_SCROLL_STEP_DOWN);
+ add_spin_binding (binding_set, GDK_Page_Up, 0, GTK_SCROLL_PAGE_UP);
+ add_spin_binding (binding_set, GDK_Page_Down, 0, GTK_SCROLL_PAGE_DOWN);
+ add_spin_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_END);
+ add_spin_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
}
static void
spin_button->adjustment = NULL;
spin_button->panel = NULL;
spin_button->timer = 0;
- spin_button->ev_time = 0;
spin_button->climb_rate = 0.0;
spin_button->timer_step = 0.0;
spin_button->update_policy = GTK_UPDATE_ALWAYS;
- spin_button->in_child = 2;
- spin_button->click_child = 2;
+ spin_button->in_child = NO_ARROW;
+ spin_button->click_child = NO_ARROW;
spin_button->button = 0;
spin_button->need_timer = FALSE;
spin_button->timer_calls = 0;
spin_button->numeric = FALSE;
spin_button->wrap = FALSE;
spin_button->snap_to_ticks = FALSE;
+
gtk_spin_button_set_adjustment (spin_button,
(GtkAdjustment*) gtk_adjustment_new (0, 0, 0, 0, 0, 0));
}
static void
gtk_spin_button_finalize (GObject *object)
{
- g_return_if_fail (GTK_IS_SPIN_BUTTON (object));
-
gtk_object_unref (GTK_OBJECT (GTK_SPIN_BUTTON (object)->adjustment));
G_OBJECT_CLASS (parent_class)->finalize (object);
static void
gtk_spin_button_map (GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
-
if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget))
{
GTK_WIDGET_CLASS (parent_class)->map (widget);
static void
gtk_spin_button_unmap (GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
-
if (GTK_WIDGET_MAPPED (widget))
{
gdk_window_hide (GTK_SPIN_BUTTON (widget)->panel);
gint return_val;
gint arrow_size;
- g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
-
spin_button = GTK_SPIN_BUTTON (widget);
arrow_size = spin_button_get_arrow_size (spin_button);
&return_val);
if (return_val == FALSE)
gtk_spin_button_default_output (spin_button);
+
+ gtk_widget_queue_resize (GTK_WIDGET (spin_button));
}
static void
gtk_spin_button_unrealize (GtkWidget *widget)
{
- GtkSpinButton *spin;
-
- g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
-
- spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
GtkEntry *entry;
GtkSpinButton *spin_button;
gint arrow_size;
-
- g_return_if_fail (requisition != NULL);
- g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
entry = GTK_ENTRY (widget);
spin_button = GTK_SPIN_BUTTON (widget);
w = MIN (string_len, max_string_len) * digit_width;
width = MAX (width, w);
- requisition->width = width + arrow_size + 2 * widget->style->xthickness;
+ requisition->width = width;
if (interior_focus)
requisition->width += 2 * focus_width;
}
- else
- {
- requisition->width += arrow_size + 2 * widget->style->xthickness;
- }
+
+ requisition->width += arrow_size + 2 * widget->style->xthickness;
}
static void
GtkAllocation *allocation)
{
GtkSpinButton *spin;
- GtkAllocation child_allocation;
+ GtkAllocation entry_allocation;
+ GtkAllocation panel_allocation;
gint arrow_size;
+ gint panel_width;
g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
g_return_if_fail (allocation != NULL);
spin = GTK_SPIN_BUTTON (widget);
arrow_size = spin_button_get_arrow_size (spin);
-
- child_allocation = *allocation;
- if (child_allocation.width > arrow_size + 2 * widget->style->xthickness)
- child_allocation.width -= arrow_size + 2 * widget->style->xthickness;
+ panel_width = arrow_size + 2 * widget->style->xthickness;
+
+ widget->allocation = *allocation;
+
+ entry_allocation = *allocation;
+ entry_allocation.width -= panel_width;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- child_allocation.x += arrow_size + 2 * widget->style->xthickness;
+ {
+ entry_allocation.x += panel_width;
+ panel_allocation.x = allocation->x;
+ }
+ else
+ {
+ panel_allocation.x = allocation->x + allocation->width - panel_width;
+ }
- GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, &child_allocation);
+ panel_allocation.width = panel_width;
+ panel_allocation.height = MIN (widget->requisition.height, allocation->height);
- widget->allocation = *allocation;
+ panel_allocation.y = allocation->y + (allocation->height -
+ panel_allocation.height) / 2;
+
+ GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, &entry_allocation);
if (GTK_WIDGET_REALIZED (widget))
{
- child_allocation.width = arrow_size + 2 * widget->style->xthickness;
- child_allocation.height = widget->requisition.height;
-
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
- child_allocation.x = (allocation->x + allocation->width -
- arrow_size - 2 * widget->style->xthickness);
- else
- child_allocation.x = allocation->x;
-
- child_allocation.y = allocation->y + (allocation->height - widget->requisition.height) / 2;
-
gdk_window_move_resize (GTK_SPIN_BUTTON (widget)->panel,
- child_allocation.x,
- child_allocation.y,
- child_allocation.width,
- child_allocation.height);
+ panel_allocation.x,
+ panel_allocation.y,
+ panel_allocation.width,
+ panel_allocation.height);
}
+
+ spin_button_redraw (spin);
}
static gint
GdkEventExpose *event)
{
GtkSpinButton *spin;
- gint arrow_size;
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
spin = GTK_SPIN_BUTTON (widget);
- arrow_size = spin_button_get_arrow_size (spin);
if (GTK_WIDGET_DRAWABLE (widget))
{
GtkShadowType shadow_type;
+ GdkRectangle rect;
- /* FIXME this seems like really broken code -
- * why aren't we looking at event->window
- * and acting accordingly?
+ if (event->window != spin->panel)
+ GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
+ /* we redraw the panel even if it wasn't exposed. This is
+ * because spin->panel is not a child window of widget->window,
+ * so it will not be invalidated by eg. gtk_widget_queue_draw().
*/
+ rect.x = 0;
+ rect.y = 0;
+
+ gdk_window_get_size (spin->panel, &rect.width, &rect.height);
shadow_type = spin_button_get_shadow_type (spin);
+
+ gdk_window_begin_paint_rect (spin->panel, &rect);
+
if (shadow_type != GTK_SHADOW_NONE)
- gtk_paint_box (widget->style, spin->panel,
- GTK_STATE_NORMAL, shadow_type,
- &event->area, widget, "spinbutton",
- 0, 0,
- arrow_size + 2 * widget->style->xthickness,
- widget->requisition.height);
- else
- {
- gdk_window_set_back_pixmap (spin->panel, NULL, TRUE);
- gdk_window_clear_area (spin->panel,
- event->area.x, event->area.y,
- event->area.width, event->area.height);
- }
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_UP);
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_DOWN);
-
- GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+ {
+ gtk_paint_box (widget->style, spin->panel,
+ GTK_STATE_NORMAL, shadow_type,
+ NULL, widget, "spinbutton",
+ rect.x, rect.y, rect.width, rect.height);
+ }
+
+ gtk_spin_button_draw_arrow (spin, GTK_ARROW_UP);
+ gtk_spin_button_draw_arrow (spin, GTK_ARROW_DOWN);
+
+ gdk_window_end_paint (spin->panel);
}
+
+ return FALSE;
+}
+
+static gboolean
+spin_button_at_limit (GtkSpinButton *spin_button,
+ GtkArrowType arrow)
+{
+ if (spin_button->wrap)
+ return FALSE;
+ if (arrow == GTK_ARROW_UP &&
+ (spin_button->adjustment->upper - spin_button->adjustment->value <= EPSILON))
+ return TRUE;
+
+ if (arrow == GTK_ARROW_DOWN &&
+ (spin_button->adjustment->value - spin_button->adjustment->lower <= EPSILON))
+ return TRUE;
+
return FALSE;
}
static void
gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
- guint arrow)
+ GtkArrowType arrow_type)
{
- GtkShadowType spin_shadow_type;
GtkStateType state_type;
GtkShadowType shadow_type;
GtkWidget *widget;
gint x;
gint y;
- gint arrow_size;
+ gint height;
+ gint width;
+ gint h, w;
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+ g_return_if_fail (arrow_type == GTK_ARROW_UP || arrow_type == GTK_ARROW_DOWN);
widget = GTK_WIDGET (spin_button);
- spin_shadow_type = spin_button_get_shadow_type (spin_button);
- arrow_size = spin_button_get_arrow_size (spin_button);
- if (GTK_WIDGET_DRAWABLE (spin_button))
+ if (GTK_WIDGET_DRAWABLE (widget))
{
- if (!spin_button->wrap &&
- (((arrow == GTK_ARROW_UP &&
- (spin_button->adjustment->upper - spin_button->adjustment->value
- <= EPSILON))) ||
- ((arrow == GTK_ARROW_DOWN &&
- (spin_button->adjustment->value - spin_button->adjustment->lower
- <= EPSILON)))))
+ width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
+
+ if (arrow_type == GTK_ARROW_UP)
{
- shadow_type = GTK_SHADOW_ETCHED_IN;
- state_type = GTK_STATE_NORMAL;
+ x = 0;
+ y = 0;
+
+ height = widget->requisition.height / 2;
}
else
{
- if (spin_button->in_child == arrow)
- {
- if (spin_button->click_child == arrow)
- state_type = GTK_STATE_ACTIVE;
- else
- state_type = GTK_STATE_PRELIGHT;
- }
- else
- state_type = GTK_STATE_NORMAL;
-
- if (spin_button->click_child == arrow)
- shadow_type = GTK_SHADOW_IN;
- else
- shadow_type = GTK_SHADOW_OUT;
+ x = 0;
+ y = widget->requisition.height / 2;
+
+ height = (widget->requisition.height + 1) / 2;
}
- if (arrow == GTK_ARROW_UP)
+
+ if (spin_button_at_limit (spin_button, arrow_type))
{
- if (spin_shadow_type != GTK_SHADOW_NONE)
- {
- x = widget->style->xthickness;
- y = widget->style->ythickness;
- }
- else
- {
- x = widget->style->xthickness - 1;
- y = widget->style->ythickness - 1;
- }
- gtk_paint_arrow (widget->style, spin_button->panel,
- state_type, shadow_type,
- NULL, widget, "spinbutton",
- arrow, TRUE,
- x, y, arrow_size,
- widget->requisition.height / 2
- - widget->style->ythickness);
+ shadow_type = GTK_SHADOW_OUT;
+ state_type = GTK_STATE_INSENSITIVE;
}
else
{
- if (spin_shadow_type != GTK_SHADOW_NONE)
+ if (spin_button->click_child == arrow_type)
{
- x = widget->style->xthickness;
- y = widget->requisition.height / 2;
+ state_type = GTK_STATE_ACTIVE;
+ shadow_type = GTK_SHADOW_IN;
}
else
{
- x = widget->style->xthickness - 1;
- y = widget->requisition.height / 2 + 1;
+ if (spin_button->in_child == arrow_type &&
+ spin_button->click_child == NO_ARROW)
+ {
+ state_type = GTK_STATE_PRELIGHT;
+ }
+ else
+ {
+ state_type = GTK_WIDGET_STATE (widget);
+ }
+
+ shadow_type = GTK_SHADOW_OUT;
}
- gtk_paint_arrow (widget->style, spin_button->panel,
- state_type, shadow_type,
- NULL, widget, "spinbutton",
- arrow, TRUE,
- x, y, arrow_size,
- widget->requisition.height / 2
- - widget->style->ythickness);
}
+
+ gtk_paint_box (widget->style, spin_button->panel,
+ state_type, shadow_type,
+ NULL, widget,
+ (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
+ x, y, width, height);
+
+ height = widget->requisition.height;
+
+ if (arrow_type == GTK_ARROW_DOWN)
+ {
+ y = height / 2;
+ height = height - y - 2;
+ }
+ else
+ {
+ y = 2;
+ height = height / 2 - 2;
+ }
+
+ width -= 3;
+
+ if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ x = 2;
+ else
+ x = 1;
+
+ w = width / 2;
+ w -= w % 2 - 1; /* force odd */
+ h = (w + 1) / 2;
+
+ x += (width - w) / 2;
+ y += (height - h) / 2;
+
+ height = h;
+ width = w;
+
+ gtk_paint_arrow (widget->style, spin_button->panel,
+ state_type, shadow_type,
+ NULL, widget, "spinbutton",
+ arrow_type, TRUE,
+ x, y, width, height);
}
}
gtk_spin_button_enter_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
- GtkSpinButton *spin;
-
- g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
if (event->window == spin->panel)
{
gdk_window_get_pointer (spin->panel, &x, &y, NULL);
if (y <= widget->requisition.height / 2)
- {
- spin->in_child = GTK_ARROW_UP;
- if (spin->click_child == 2)
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_UP);
- }
+ spin->in_child = GTK_ARROW_UP;
else
- {
- spin->in_child = GTK_ARROW_DOWN;
- if (spin->click_child == 2)
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_DOWN);
- }
+ spin->in_child = GTK_ARROW_DOWN;
+
+ spin_button_redraw (spin);
}
+
return FALSE;
}
gtk_spin_button_leave_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
- GtkSpinButton *spin;
-
- g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
- spin = GTK_SPIN_BUTTON (widget);
-
- if (event->window == spin->panel && spin->click_child == 2)
- {
- if (spin->in_child == GTK_ARROW_UP)
- {
- spin->in_child = 2;
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_UP);
- }
- else
- {
- spin->in_child = 2;
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_DOWN);
- }
- }
+ spin->in_child = NO_ARROW;
+ spin_button_redraw (spin);
+
return FALSE;
}
gtk_spin_button_focus_out (GtkWidget *widget,
GdkEventFocus *event)
{
- g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
if (GTK_ENTRY (widget)->editable)
gtk_spin_button_update (GTK_SPIN_BUTTON (widget));
gtk_spin_button_stop_spinning (GTK_SPIN_BUTTON (widget));
}
+static void
+gtk_spin_button_state_changed (GtkWidget *widget,
+ GtkStateType previous_state)
+{
+ if (!GTK_WIDGET_IS_SENSITIVE (widget))
+ gtk_spin_button_stop_spinning (GTK_SPIN_BUTTON (widget));
+}
+
static gint
gtk_spin_button_scroll (GtkWidget *widget,
GdkEventScroll *event)
{
- GtkSpinButton *spin;
-
- g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
if (event->direction == GDK_SCROLL_UP)
{
}
static void
-gtk_spin_button_stop_spinning(GtkSpinButton *spin)
+gtk_spin_button_stop_spinning (GtkSpinButton *spin)
{
if (spin->timer)
{
spin->button = 0;
spin->timer = 0;
+ spin->timer_step = spin->adjustment->step_increment;
+ spin->timer_calls = 0;
}
static void
GtkArrowType click_child,
gfloat step)
{
+ g_return_if_fail (click_child == GTK_ARROW_UP || click_child == GTK_ARROW_DOWN);
+
spin->click_child = click_child;
gtk_spin_button_real_spin (spin, click_child == GTK_ARROW_UP ? step : -step);
(GtkFunction) gtk_spin_button_timer, (gpointer) spin);
}
- gtk_spin_button_draw_arrow (spin, click_child);
+ spin_button_redraw (spin);
}
static gint
gtk_spin_button_button_press (GtkWidget *widget,
GdkEventButton *event)
{
- GtkSpinButton *spin;
-
- g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
if (!spin->button)
{
start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
else if (event->button == 2)
start_spinning (spin, GTK_ARROW_UP, spin->adjustment->page_increment);
+ else
+ spin->click_child = GTK_ARROW_UP;
}
else
{
start_spinning (spin, GTK_ARROW_DOWN, spin->adjustment->step_increment);
else if (event->button == 2)
start_spinning (spin, GTK_ARROW_DOWN, spin->adjustment->page_increment);
+ else
+ spin->click_child = GTK_ARROW_DOWN;
}
return TRUE;
}
gtk_spin_button_button_release (GtkWidget *widget,
GdkEventButton *event)
{
- GtkSpinButton *spin;
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
gint arrow_size;
- g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- spin = GTK_SPIN_BUTTON (widget);
arrow_size = spin_button_get_arrow_size (spin);
if (event->button == spin->button)
}
}
click_child = spin->click_child;
- spin->click_child = 2;
- gtk_spin_button_draw_arrow (spin, click_child);
+ spin->click_child = NO_ARROW;
+ spin->button = 0;
+ spin_button_redraw (spin);
+
return TRUE;
}
else
return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
-
- return FALSE;
}
static gint
gtk_spin_button_motion_notify (GtkWidget *widget,
GdkEventMotion *event)
{
- GtkSpinButton *spin;
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
- g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- spin = GTK_SPIN_BUTTON (widget);
-
if (spin->button)
return FALSE;
if (event->window == spin->panel)
{
gint y;
-
- y = event->y;
- if (event->is_hint)
- gdk_window_get_pointer (spin->panel, NULL, &y, NULL);
-
+
+ gdk_window_get_pointer (spin->panel, NULL, &y, NULL);
+
if (y <= widget->requisition.height / 2 &&
spin->in_child == GTK_ARROW_DOWN)
{
spin->in_child = GTK_ARROW_UP;
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_UP);
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_DOWN);
+ spin_button_redraw (spin);
}
else if (y > widget->requisition.height / 2 &&
spin->in_child == GTK_ARROW_UP)
{
spin->in_child = GTK_ARROW_DOWN;
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_UP);
- gtk_spin_button_draw_arrow (spin, GTK_ARROW_DOWN);
+ spin_button_redraw (spin);
}
+
return FALSE;
}
{
gint return_val;
- g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-
return_val = FALSE;
gtk_signal_emit (GTK_OBJECT (spin_button), spinbutton_signals[OUTPUT],
&return_val);
gtk_signal_emit (GTK_OBJECT (spin_button),
spinbutton_signals[VALUE_CHANGED]);
- gtk_spin_button_draw_arrow (spin_button, GTK_ARROW_UP);
- gtk_spin_button_draw_arrow (spin_button, GTK_ARROW_DOWN);
+ spin_button_redraw (spin_button);
g_object_notify (G_OBJECT (spin_button), "value");
}
-static gint
-gtk_spin_button_key_press (GtkWidget *widget,
- GdkEventKey *event)
+static void
+gtk_spin_button_real_change_value (GtkSpinButton *spin,
+ GtkScrollType scroll)
{
- GtkSpinButton *spin;
- gint key;
- gboolean key_repeat = FALSE;
- gboolean retval = FALSE;
-
- g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- spin = GTK_SPIN_BUTTON (widget);
- key = event->keyval;
-
- key_repeat = (event->time == spin->ev_time);
-
- if (GTK_ENTRY (widget)->editable)
+ if (GTK_ENTRY (spin)->editable)
{
- switch (key)
+ switch (scroll)
{
- case GDK_KP_Up:
- case GDK_Up:
-
- if (GTK_WIDGET_HAS_FOCUS (widget))
- {
- gtk_signal_emit_stop_by_name (GTK_OBJECT (widget),
- "key_press_event");
- if (!key_repeat)
- spin->timer_step = spin->adjustment->step_increment;
-
- gtk_spin_button_real_spin (spin, spin->timer_step);
-
- if (key_repeat)
- {
- if (spin->climb_rate > 0.0 && spin->timer_step
- < spin->adjustment->page_increment)
- {
- if (spin->timer_calls < MAX_TIMER_CALLS)
- spin->timer_calls++;
- else
- {
- spin->timer_calls = 0;
- spin->timer_step += spin->climb_rate;
- }
- }
- }
- retval = TRUE;
- }
- break;
+ case GTK_SCROLL_STEP_BACKWARD:
+ case GTK_SCROLL_STEP_DOWN:
+ case GTK_SCROLL_STEP_LEFT:
+ gtk_spin_button_real_spin (spin, -spin->timer_step);
+
+ if (spin->climb_rate > 0.0 && spin->timer_step
+ < spin->adjustment->page_increment)
+ {
+ if (spin->timer_calls < MAX_TIMER_CALLS)
+ spin->timer_calls++;
+ else
+ {
+ spin->timer_calls = 0;
+ spin->timer_step += spin->climb_rate;
+ }
+ }
+ break;
- case GDK_KP_Down:
- case GDK_Down:
-
- if (GTK_WIDGET_HAS_FOCUS (widget))
- {
- gtk_signal_emit_stop_by_name (GTK_OBJECT (widget),
- "key_press_event");
- if (!key_repeat)
- spin->timer_step = spin->adjustment->step_increment;
-
- gtk_spin_button_real_spin (spin, -spin->timer_step);
-
- if (key_repeat)
- {
- if (spin->climb_rate > 0.0 && spin->timer_step
- < spin->adjustment->page_increment)
- {
- if (spin->timer_calls < MAX_TIMER_CALLS)
- spin->timer_calls++;
- else
- {
- spin->timer_calls = 0;
- spin->timer_step += spin->climb_rate;
- }
- }
- }
- retval = TRUE;
- }
+ case GTK_SCROLL_STEP_FORWARD:
+ case GTK_SCROLL_STEP_UP:
+ case GTK_SCROLL_STEP_RIGHT:
+ gtk_spin_button_real_spin (spin, spin->timer_step);
+
+ if (spin->climb_rate > 0.0 && spin->timer_step
+ < spin->adjustment->page_increment)
+ {
+ if (spin->timer_calls < MAX_TIMER_CALLS)
+ spin->timer_calls++;
+ else
+ {
+ spin->timer_calls = 0;
+ spin->timer_step += spin->climb_rate;
+ }
+ }
break;
- case GDK_KP_Page_Up:
- case GDK_Page_Up:
-
- if (event->state & GDK_CONTROL_MASK)
- {
- gdouble diff = spin->adjustment->upper - spin->adjustment->value;
- if (diff > EPSILON)
- gtk_spin_button_real_spin (spin, diff);
- }
- else
- gtk_spin_button_real_spin (spin, spin->adjustment->page_increment);
+ case GTK_SCROLL_PAGE_BACKWARD:
+ case GTK_SCROLL_PAGE_DOWN:
+ case GTK_SCROLL_PAGE_LEFT:
+ gtk_spin_button_real_spin (spin, -spin->adjustment->page_increment);
+ break;
- retval = TRUE;
+ case GTK_SCROLL_PAGE_FORWARD:
+ case GTK_SCROLL_PAGE_UP:
+ case GTK_SCROLL_PAGE_RIGHT:
+ gtk_spin_button_real_spin (spin, spin->adjustment->page_increment);
break;
- case GDK_KP_Page_Down:
- case GDK_Page_Down:
-
- if (event->state & GDK_CONTROL_MASK)
- {
- gdouble diff = spin->adjustment->value - spin->adjustment->lower;
- if (diff > EPSILON)
- gtk_spin_button_real_spin (spin, -diff);
- }
- else
- gtk_spin_button_real_spin (spin, -spin->adjustment->page_increment);
-
- retval = TRUE;
- break;
+ case GTK_SCROLL_START:
+ {
+ gdouble diff = spin->adjustment->value - spin->adjustment->lower;
+ if (diff > EPSILON)
+ gtk_spin_button_real_spin (spin, -diff);
+ break;
+ }
+ case GTK_SCROLL_END:
+ {
+ gdouble diff = spin->adjustment->upper - spin->adjustment->value;
+ if (diff > EPSILON)
+ gtk_spin_button_real_spin (spin, diff);
+ break;
+ }
+
default:
+ g_warning ("Invalid scroll type %d for GtkSpinButton::change-value", scroll);
break;
}
- }
-
- if (retval)
- {
+
gtk_spin_button_update (spin);
- return TRUE;
}
- else
- return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
}
static gint
gtk_spin_button_key_release (GtkWidget *widget,
GdkEventKey *event)
{
- GtkSpinButton *spin;
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
- g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
-
- spin = GTK_SPIN_BUTTON (widget);
+ /* We only get a release at the end of a key repeat run, so reset the timer_step */
+ spin->timer_step = spin->adjustment->step_increment;
+ spin->timer_calls = 0;
- spin->ev_time = event->time;
return TRUE;
}
{
gdouble inc;
gdouble tmp;
-
+
inc = spin_button->adjustment->step_increment;
tmp = (val - spin_button->adjustment->lower) / inc;
if (tmp - floor (tmp) < ceil (tmp) - tmp)
{
GtkAdjustment *adj;
gdouble new_value = 0.0;
-
- g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
adj = spin_button->adjustment;
if (fabs (new_value - adj->value) > EPSILON)
gtk_adjustment_set_value (adj, new_value);
+
+ spin_button_redraw (spin_button);
}
static gint
spin = gtk_type_new (GTK_TYPE_SPIN_BUTTON);
- adj = gtk_adjustment_new (min, min, max, step, 10 * step, step);
+ adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
if (fabs (step) >= 1.0 || step == 0.0)
digits = 0;
spin_button = GTK_SPIN_BUTTON (data);
+ spin_button->timer_step = spin_button->adjustment->step_increment;
gtk_widget_queue_resize (GTK_WIDGET (spin_button));
}
}
gtk_widget_queue_resize (GTK_WIDGET (spin_button));
+
+ spin_button->timer_step = spin_button->adjustment->step_increment;
}
g_object_notify (G_OBJECT (spin_button), "adjustment");
{
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
- spin_button->numeric = (numeric != 0);
+ numeric = numeric != FALSE;
- g_object_notify (G_OBJECT (spin_button), "numeric");
+ if (spin_button->numeric != numeric)
+ {
+ spin_button->numeric = numeric;
+ g_object_notify (G_OBJECT (spin_button), "numeric");
+ }
}
/**
{
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
- spin_button->wrap = (wrap != 0);
+ wrap = wrap != FALSE;
+
+ if (spin_button->wrap != wrap)
+ {
+ spin_button->wrap = (wrap != 0);
- g_object_notify (G_OBJECT (spin_button), "wrap");
+ g_object_notify (G_OBJECT (spin_button), "wrap");
+ }
}
/**
spin_button_get_arrow_size (GtkSpinButton *spin_button)
{
gint size = pango_font_description_get_size (GTK_WIDGET (spin_button)->style->font_desc);
-
- return PANGO_PIXELS (size);
+ gint arrow_size;
+
+ arrow_size = MAX (PANGO_PIXELS (size), MIN_ARROW_WIDTH);
+
+ return arrow_size - arrow_size % 2; /* force even */
}
/**
else if (return_val == GTK_INPUT_ERROR)
error = 1;
+ spin_button_redraw (spin_button);
+
if (spin_button->update_policy == GTK_UPDATE_ALWAYS)
{
if (val < spin_button->adjustment->lower)
}
}
+static void
+spin_button_redraw (GtkSpinButton *spin_button)
+{
+ GtkWidget *widget;
+
+ widget = GTK_WIDGET (spin_button);
+
+ if (GTK_WIDGET_DRAWABLE (widget))
+ {
+ gtk_widget_queue_draw (widget);
+
+ /* We must invalidate the panel window ourselves, because it
+ * is not a child of widget->window
+ */
+ gdk_window_invalidate_rect (spin_button->panel, NULL, TRUE);
+ }
+}
projects / ~andy / gtk / blobdiff