* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * 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.
*/
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
+ * file for a list of people on the GTK+ Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#include "config.h"
#include "gtkcheckbutton.h"
#include "gtklabel.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
-#define INDICATOR_SIZE 10
+#define INDICATOR_SIZE 13
#define INDICATOR_SPACING 2
-#define CHECK_BUTTON_CLASS(w) GTK_CHECK_BUTTON_CLASS (GTK_OBJECT (w)->klass)
-
-static void gtk_check_button_class_init (GtkCheckButtonClass *klass);
-static void gtk_check_button_init (GtkCheckButton *check_button);
-static void gtk_check_button_draw (GtkWidget *widget,
- GdkRectangle *area);
-static void gtk_check_button_draw_focus (GtkWidget *widget);
static void gtk_check_button_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_check_button_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static gint gtk_check_button_expose (GtkWidget *widget,
GdkEventExpose *event);
+static void gtk_check_button_paint (GtkWidget *widget,
+ GdkRectangle *area);
static void gtk_check_button_draw_indicator (GtkCheckButton *check_button,
GdkRectangle *area);
static void gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
GdkRectangle *area);
-static GtkToggleButtonClass *parent_class = NULL;
-
-
-GtkType
-gtk_check_button_get_type (void)
-{
- static GtkType check_button_type = 0;
-
- if (!check_button_type)
- {
- static const GtkTypeInfo check_button_info =
- {
- "GtkCheckButton",
- sizeof (GtkCheckButton),
- sizeof (GtkCheckButtonClass),
- (GtkClassInitFunc) gtk_check_button_class_init,
- (GtkObjectInitFunc) gtk_check_button_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- check_button_type = gtk_type_unique (GTK_TYPE_TOGGLE_BUTTON, &check_button_info);
- }
-
- return check_button_type;
-}
+G_DEFINE_TYPE (GtkCheckButton, gtk_check_button, GTK_TYPE_TOGGLE_BUTTON)
static void
gtk_check_button_class_init (GtkCheckButtonClass *class)
GtkWidgetClass *widget_class;
widget_class = (GtkWidgetClass*) class;
- parent_class = gtk_type_class (gtk_toggle_button_get_type ());
- widget_class->draw = gtk_check_button_draw;
- widget_class->draw_focus = gtk_check_button_draw_focus;
widget_class->size_request = gtk_check_button_size_request;
widget_class->size_allocate = gtk_check_button_size_allocate;
widget_class->expose_event = gtk_check_button_expose;
-
- class->indicator_size = INDICATOR_SIZE;
- class->indicator_spacing = INDICATOR_SPACING;
+
class->draw_indicator = gtk_real_check_button_draw_indicator;
+
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int ("indicator-size",
+ P_("Indicator Size"),
+ P_("Size of check or radio indicator"),
+ 0,
+ G_MAXINT,
+ INDICATOR_SIZE,
+ GTK_PARAM_READABLE));
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int ("indicator-spacing",
+ P_("Indicator Spacing"),
+ P_("Spacing around check or radio indicator"),
+ 0,
+ G_MAXINT,
+ INDICATOR_SPACING,
+ GTK_PARAM_READABLE));
}
static void
gtk_check_button_init (GtkCheckButton *check_button)
{
GTK_WIDGET_SET_FLAGS (check_button, GTK_NO_WINDOW);
+ GTK_WIDGET_UNSET_FLAGS (check_button, GTK_RECEIVES_DEFAULT);
GTK_TOGGLE_BUTTON (check_button)->draw_indicator = TRUE;
+ GTK_BUTTON (check_button)->depress_on_activate = FALSE;
}
GtkWidget*
gtk_check_button_new (void)
{
- return gtk_widget_new (GTK_TYPE_CHECK_BUTTON, NULL);
+ return g_object_new (GTK_TYPE_CHECK_BUTTON, NULL);
}
GtkWidget*
gtk_check_button_new_with_label (const gchar *label)
{
- GtkWidget *check_button;
- GtkWidget *label_widget;
-
- check_button = gtk_check_button_new ();
- label_widget = gtk_label_new (label);
- gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
-
- gtk_container_add (GTK_CONTAINER (check_button), label_widget);
- gtk_widget_show (label_widget);
-
- return check_button;
+ return g_object_new (GTK_TYPE_CHECK_BUTTON, "label", label, NULL);
}
+/**
+ * gtk_check_button_new_with_mnemonic:
+ * @label: The text of the button, with an underscore in front of the
+ * mnemonic character
+ * @returns: a new #GtkCheckButton
+ *
+ * Creates a new #GtkCheckButton containing a label. The label
+ * will be created using gtk_label_new_with_mnemonic(), so underscores
+ * in @label indicate the mnemonic for the check button.
+ **/
+GtkWidget*
+gtk_check_button_new_with_mnemonic (const gchar *label)
+{
+ return g_object_new (GTK_TYPE_CHECK_BUTTON,
+ "label", label,
+ "use-underline", TRUE,
+ NULL);
+}
+
+
+/* This should only be called when toggle_button->draw_indicator
+ * is true.
+ */
static void
-gtk_check_button_draw (GtkWidget *widget,
- GdkRectangle *area)
+gtk_check_button_paint (GtkWidget *widget,
+ GdkRectangle *area)
{
- GtkCheckButton *check_button;
- GtkToggleButton *toggle_button;
- GtkBin *bin;
- GdkRectangle child_area;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
- g_return_if_fail (area != NULL);
-
- check_button = GTK_CHECK_BUTTON (widget);
- toggle_button = GTK_TOGGLE_BUTTON (widget);
- bin = GTK_BIN (widget);
+ GtkCheckButton *check_button = GTK_CHECK_BUTTON (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_widget_is_drawable (widget))
{
- if (toggle_button->draw_indicator)
- {
- gint border_width;
+ gint border_width;
+ gint interior_focus;
+ gint focus_width;
+ gint focus_pad;
- gtk_check_button_draw_indicator (check_button, area);
+ gtk_widget_style_get (widget,
+ "interior-focus", &interior_focus,
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
+
+ gtk_check_button_draw_indicator (check_button, area);
+
+ border_width = GTK_CONTAINER (widget)->border_width;
+ if (gtk_widget_has_focus (widget))
+ {
+ GtkWidget *child = GTK_BIN (widget)->child;
- border_width = GTK_CONTAINER (widget)->border_width;
- if (GTK_WIDGET_HAS_FOCUS (widget))
- gtk_paint_focus (widget->style, widget->window,
- NULL, widget, "checkbutton",
+ if (interior_focus && child && gtk_widget_get_visible (child))
+ gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
+ area, widget, "checkbutton",
+ child->allocation.x - focus_width - focus_pad,
+ child->allocation.y - focus_width - focus_pad,
+ child->allocation.width + 2 * (focus_width + focus_pad),
+ child->allocation.height + 2 * (focus_width + focus_pad));
+ else
+ gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
+ area, widget, "checkbutton",
border_width + widget->allocation.x,
border_width + widget->allocation.y,
- widget->allocation.width - 2 * border_width - 1,
- widget->allocation.height - 2 * border_width - 1);
-
- if (bin->child && GTK_WIDGET_NO_WINDOW (bin->child) &&
- gtk_widget_intersect (bin->child, area, &child_area))
- gtk_widget_draw (bin->child, &child_area);
- }
- else
- {
- if (GTK_WIDGET_CLASS (parent_class)->draw)
- (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
+ widget->allocation.width - 2 * border_width,
+ widget->allocation.height - 2 * border_width);
}
}
}
-static void
-gtk_check_button_draw_focus (GtkWidget *widget)
+void
+_gtk_check_button_get_props (GtkCheckButton *check_button,
+ gint *indicator_size,
+ gint *indicator_spacing)
{
- gint border_width;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
-
- border_width = GTK_CONTAINER (widget)->border_width;
- gtk_widget_queue_clear_area (widget->parent,
- border_width + widget->allocation.x,
- border_width + widget->allocation.y,
- widget->allocation.width - 2 * border_width,
- widget->allocation.height - 2 * border_width);
+ GtkWidget *widget = GTK_WIDGET (check_button);
+
+ if (indicator_size)
+ gtk_widget_style_get (widget, "indicator-size", indicator_size, NULL);
+
+ if (indicator_spacing)
+ gtk_widget_style_get (widget, "indicator-spacing", indicator_spacing, NULL);
}
static void
gtk_check_button_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
- GtkToggleButton *toggle_button;
- gint temp;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
- g_return_if_fail (requisition != NULL);
-
- toggle_button = GTK_TOGGLE_BUTTON (widget);
-
- if (GTK_WIDGET_CLASS (parent_class)->size_request)
- (* GTK_WIDGET_CLASS (parent_class)->size_request) (widget, requisition);
+ GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (widget);
if (toggle_button->draw_indicator)
{
- requisition->width += (CHECK_BUTTON_CLASS (widget)->indicator_size +
- CHECK_BUTTON_CLASS (widget)->indicator_spacing * 3 + 2);
+ GtkWidget *child;
+ gint temp;
+ gint indicator_size;
+ gint indicator_spacing;
+ gint border_width = GTK_CONTAINER (widget)->border_width;
+ gint focus_width;
+ gint focus_pad;
+
+ gtk_widget_style_get (GTK_WIDGET (widget),
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
+
+ requisition->width = border_width * 2;
+ requisition->height = border_width * 2;
+
+ _gtk_check_button_get_props (GTK_CHECK_BUTTON (widget),
+ &indicator_size, &indicator_spacing);
+
+ child = GTK_BIN (widget)->child;
+ if (child && gtk_widget_get_visible (child))
+ {
+ GtkRequisition child_requisition;
+
+ gtk_widget_size_request (child, &child_requisition);
+
+ requisition->width += child_requisition.width + indicator_spacing;
+ requisition->height += child_requisition.height;
+ }
+
+ requisition->width += (indicator_size + indicator_spacing * 2 + 2 * (focus_width + focus_pad));
- temp = (CHECK_BUTTON_CLASS (widget)->indicator_size +
- CHECK_BUTTON_CLASS (widget)->indicator_spacing * 2);
- requisition->height = MAX (requisition->height, temp) + 2;
+ temp = indicator_size + indicator_spacing * 2;
+ requisition->height = MAX (requisition->height, temp) + 2 * (focus_width + focus_pad);
}
+ else
+ GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_request (widget, requisition);
}
static void
GtkToggleButton *toggle_button;
GtkButton *button;
GtkAllocation child_allocation;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
- g_return_if_fail (allocation != NULL);
-
+
+ button = GTK_BUTTON (widget);
check_button = GTK_CHECK_BUTTON (widget);
toggle_button = GTK_TOGGLE_BUTTON (widget);
if (toggle_button->draw_indicator)
{
+ gint indicator_size;
+ gint indicator_spacing;
+ gint focus_width;
+ gint focus_pad;
+
+ _gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing);
+ gtk_widget_style_get (widget,
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
+
widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget))
- gdk_window_move_resize (toggle_button->event_window,
+ gdk_window_move_resize (button->event_window,
allocation->x, allocation->y,
allocation->width, allocation->height);
- button = GTK_BUTTON (widget);
-
- if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child))
+ if (GTK_BIN (button)->child && gtk_widget_get_visible (GTK_BIN (button)->child))
{
- child_allocation.x = (GTK_CONTAINER (widget)->border_width +
- CHECK_BUTTON_CLASS (widget)->indicator_size +
- CHECK_BUTTON_CLASS (widget)->indicator_spacing * 3 + 1 +
- widget->allocation.x);
- child_allocation.y = GTK_CONTAINER (widget)->border_width + 1 +
- widget->allocation.y;
- child_allocation.width = MAX (1, allocation->width -
- (GTK_CONTAINER (widget)->border_width +
- CHECK_BUTTON_CLASS (widget)->indicator_size +
- CHECK_BUTTON_CLASS (widget)->indicator_spacing * 3 + 1) -
- GTK_CONTAINER (widget)->border_width - 1);
- child_allocation.height = MAX (1, allocation->height - (GTK_CONTAINER (widget)->border_width + 1) * 2);
+ GtkRequisition child_requisition;
+ gint border_width = GTK_CONTAINER (widget)->border_width;
+
+ gtk_widget_get_child_requisition (GTK_BIN (button)->child, &child_requisition);
+
+ child_allocation.width = MIN (child_requisition.width,
+ allocation->width -
+ ((border_width + focus_width + focus_pad) * 2
+ + indicator_size + indicator_spacing * 3));
+ child_allocation.width = MAX (child_allocation.width, 1);
+
+ child_allocation.height = MIN (child_requisition.height,
+ allocation->height - (border_width + focus_width + focus_pad) * 2);
+ child_allocation.height = MAX (child_allocation.height, 1);
+
+ child_allocation.x = (border_width + indicator_size + indicator_spacing * 3 +
+ widget->allocation.x + focus_width + focus_pad);
+ child_allocation.y = widget->allocation.y +
+ (allocation->height - child_allocation.height) / 2;
+
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ child_allocation.x = allocation->x + allocation->width
+ - (child_allocation.x - allocation->x + child_allocation.width);
gtk_widget_size_allocate (GTK_BIN (button)->child, &child_allocation);
}
}
else
- {
- if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
- (* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
- }
+ GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_allocate (widget, allocation);
}
static gint
gtk_check_button_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- GtkCheckButton *check_button;
GtkToggleButton *toggle_button;
GtkBin *bin;
- GdkEventExpose child_event;
-
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_CHECK_BUTTON (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
- check_button = GTK_CHECK_BUTTON (widget);
toggle_button = GTK_TOGGLE_BUTTON (widget);
bin = GTK_BIN (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_widget_is_drawable (widget))
{
if (toggle_button->draw_indicator)
{
- gtk_check_button_draw_indicator (check_button, &event->area);
-
- child_event = *event;
- if (bin->child && GTK_WIDGET_NO_WINDOW (bin->child) &&
- gtk_widget_intersect (bin->child, &event->area, &child_event.area))
- gtk_widget_event (bin->child, (GdkEvent*) &child_event);
+ gtk_check_button_paint (widget, &event->area);
- gtk_widget_draw_focus (widget);
- }
- else
- {
- if (GTK_WIDGET_CLASS (parent_class)->expose_event)
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+ if (bin->child)
+ gtk_container_propagate_expose (GTK_CONTAINER (widget),
+ bin->child,
+ event);
}
+ else if (GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event)
+ GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event (widget, event);
}
return FALSE;
{
GtkCheckButtonClass *class;
- g_return_if_fail (check_button != NULL);
g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
- class = CHECK_BUTTON_CLASS (check_button);
-
+ class = GTK_CHECK_BUTTON_GET_CLASS (check_button);
+
if (class->draw_indicator)
- (* class->draw_indicator) (check_button, area);
+ class->draw_indicator (check_button, area);
}
static void
GdkRectangle *area)
{
GtkWidget *widget;
+ GtkWidget *child;
+ GtkButton *button;
GtkToggleButton *toggle_button;
GtkStateType state_type;
GtkShadowType shadow_type;
- GdkRectangle restrict_area;
- GdkRectangle new_area;
- gint width, height;
gint x, y;
- GdkWindow *window;
-
- g_return_if_fail (check_button != NULL);
- g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
-
+ gint indicator_size;
+ gint indicator_spacing;
+ gint focus_width;
+ gint focus_pad;
+ gboolean interior_focus;
+
widget = GTK_WIDGET (check_button);
- toggle_button = GTK_TOGGLE_BUTTON (check_button);
-
- if (GTK_WIDGET_DRAWABLE (check_button))
+
+ if (gtk_widget_is_drawable (widget))
{
- window = widget->window;
-
- state_type = GTK_WIDGET_STATE (widget);
- if (state_type != GTK_STATE_NORMAL &&
- state_type != GTK_STATE_PRELIGHT)
+ button = GTK_BUTTON (check_button);
+ toggle_button = GTK_TOGGLE_BUTTON (check_button);
+
+ gtk_widget_style_get (widget,
+ "interior-focus", &interior_focus,
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
+
+ _gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing);
+
+ x = widget->allocation.x + indicator_spacing + GTK_CONTAINER (widget)->border_width;
+ y = widget->allocation.y + (widget->allocation.height - indicator_size) / 2;
+
+ child = GTK_BIN (check_button)->child;
+ if (!interior_focus || !(child && gtk_widget_get_visible (child)))
+ x += focus_width + focus_pad;
+
+ if (toggle_button->inconsistent)
+ shadow_type = GTK_SHADOW_ETCHED_IN;
+ else if (toggle_button->active)
+ shadow_type = GTK_SHADOW_IN;
+ else
+ shadow_type = GTK_SHADOW_OUT;
+
+ if (button->activate_timeout || (button->button_down && button->in_button))
+ state_type = GTK_STATE_ACTIVE;
+ else if (button->in_button)
+ state_type = GTK_STATE_PRELIGHT;
+ else if (!gtk_widget_is_sensitive (widget))
+ state_type = GTK_STATE_INSENSITIVE;
+ else
state_type = GTK_STATE_NORMAL;
- restrict_area.x = widget->allocation.x + GTK_CONTAINER (widget)->border_width;
- restrict_area.y = widget->allocation.y + GTK_CONTAINER (widget)->border_width;
- restrict_area.width = widget->allocation.width - ( 2 * GTK_CONTAINER (widget)->border_width);
- restrict_area.height = widget->allocation.height - ( 2 * GTK_CONTAINER (widget)->border_width);
-
- if (gdk_rectangle_intersect (area, &restrict_area, &new_area))
- {
- if (state_type != GTK_STATE_NORMAL)
- gtk_paint_flat_box (widget->style, window, state_type,
- GTK_SHADOW_ETCHED_OUT,
- area, widget, "checkbutton",
- new_area.x, new_area.y,
- new_area.width, new_area.height);
- }
-
- x = widget->allocation.x + CHECK_BUTTON_CLASS (widget)->indicator_spacing + GTK_CONTAINER (widget)->border_width;
- y = widget->allocation.y + (widget->allocation.height - CHECK_BUTTON_CLASS (widget)->indicator_size) / 2;
- width = CHECK_BUTTON_CLASS (widget)->indicator_size;
- height = CHECK_BUTTON_CLASS (widget)->indicator_size;
-
- if (GTK_TOGGLE_BUTTON (widget)->active)
- {
- state_type = GTK_STATE_ACTIVE;
- shadow_type = GTK_SHADOW_IN;
- }
- else
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ x = widget->allocation.x + widget->allocation.width - (indicator_size + x - widget->allocation.x);
+
+ if (GTK_WIDGET_STATE (toggle_button) == GTK_STATE_PRELIGHT)
{
- shadow_type = GTK_SHADOW_OUT;
- state_type = GTK_WIDGET_STATE (widget);
+ GdkRectangle restrict_area;
+ GdkRectangle new_area;
+
+ restrict_area.x = widget->allocation.x + GTK_CONTAINER (widget)->border_width;
+ restrict_area.y = widget->allocation.y + GTK_CONTAINER (widget)->border_width;
+ restrict_area.width = widget->allocation.width - (2 * GTK_CONTAINER (widget)->border_width);
+ restrict_area.height = widget->allocation.height - (2 * GTK_CONTAINER (widget)->border_width);
+
+ if (gdk_rectangle_intersect (area, &restrict_area, &new_area))
+ {
+ gtk_paint_flat_box (widget->style, widget->window, GTK_STATE_PRELIGHT,
+ GTK_SHADOW_ETCHED_OUT,
+ area, widget, "checkbutton",
+ new_area.x, new_area.y,
+ new_area.width, new_area.height);
+ }
}
- gtk_paint_check (widget->style, window,
+ gtk_paint_check (widget->style, widget->window,
state_type, shadow_type,
area, widget, "checkbutton",
- x + 1, y + 1, width, height);
+ x, y, indicator_size, indicator_size);
}
}
+
+#define __GTK_CHECK_BUTTON_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff