* 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
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+
+/*
+ * 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 "gtkbuttonprivate.h"
#include "gtklabel.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
-#define INDICATOR_SIZE 10
-#define INDICATOR_SPACING 2
-#define CHECK_BUTTON_CLASS(w) GTK_CHECK_BUTTON_CLASS (GTK_OBJECT (w)->klass)
+/**
+ * SECTION:gtkcheckbutton
+ * @Short_description: Create widgets with a discrete toggle button
+ * @Title: GtkCheckButton
+ * @See_also: #GtkCheckMenuItem, #GtkButton, #GtkToggleButton, #GtkRadioButton
+ *
+ * A #GtkCheckButton places a discrete #GtkToggleButton next to a widget,
+ * (usually a #GtkLabel). See the section on #GtkToggleButton widgets for
+ * more information about toggle/check buttons.
+ *
+ * The important signal ( #GtkToggleButton::toggled ) is also inherited from
+ * #GtkToggleButton.
+ */
+
+
+#define INDICATOR_SIZE 16
+#define INDICATOR_SPACING 2
-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_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_check_button_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
static void gtk_check_button_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static gint gtk_check_button_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gboolean gtk_check_button_draw (GtkWidget *widget,
+ cairo_t *cr);
+static void gtk_check_button_paint (GtkWidget *widget,
+ cairo_t *cr);
static void gtk_check_button_draw_indicator (GtkCheckButton *check_button,
- GdkRectangle *area);
+ cairo_t *cr);
static void gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
- GdkRectangle *area);
+ cairo_t *cr);
-
-static GtkToggleButtonClass *parent_class = NULL;
-
-
-guint
-gtk_check_button_get_type ()
-{
- static guint check_button_type = 0;
-
- if (!check_button_type)
- {
- GtkTypeInfo check_button_info =
- {
- "GtkCheckButton",
- sizeof (GtkCheckButton),
- sizeof (GtkCheckButtonClass),
- (GtkClassInitFunc) gtk_check_button_class_init,
- (GtkObjectInitFunc) gtk_check_button_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL,
- };
-
- check_button_type = gtk_type_unique (gtk_toggle_button_get_type (), &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->get_preferred_width = gtk_check_button_get_preferred_width;
+ widget_class->get_preferred_height = gtk_check_button_get_preferred_height;
widget_class->size_allocate = gtk_check_button_size_allocate;
- widget_class->expose_event = gtk_check_button_expose;
+ widget_class->draw = gtk_check_button_draw;
- class->indicator_size = INDICATOR_SIZE;
- class->indicator_spacing = INDICATOR_SPACING;
class->draw_indicator = gtk_real_check_button_draw_indicator;
+
+ gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_CHECK_BOX);
+
+ 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
+draw_indicator_changed (GObject *object,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ GtkButton *button = GTK_BUTTON (object);
+
+ if (gtk_toggle_button_get_mode (GTK_TOGGLE_BUTTON (button)))
+ gtk_button_set_alignment (button, 0.0, 0.5);
+ else
+ gtk_button_set_alignment (button, 0.5, 0.5);
}
static void
gtk_check_button_init (GtkCheckButton *check_button)
{
- check_button->toggle_button.draw_indicator = TRUE;
+ gtk_widget_set_receives_default (GTK_WIDGET (check_button), FALSE);
+ g_signal_connect (check_button, "notify::draw-indicator", G_CALLBACK (draw_indicator_changed), NULL);
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (check_button), TRUE);
}
+/**
+ * gtk_check_button_new:
+ *
+ * Creates a new #GtkCheckButton.
+ *
+ * Returns: a #GtkWidget.
+ */
GtkWidget*
-gtk_check_button_new ()
+gtk_check_button_new (void)
{
- return GTK_WIDGET (gtk_type_new (gtk_check_button_get_type ()));
+ return g_object_new (GTK_TYPE_CHECK_BUTTON, NULL);
}
+/**
+ * gtk_check_button_new_with_label:
+ * @label: the text for the check button.
+ *
+ * Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
+ *
+ * Returns: a #GtkWidget.
+ */
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 g_object_new (GTK_TYPE_CHECK_BUTTON, "label", label, NULL);
+}
- return check_button;
+/**
+ * gtk_check_button_new_with_mnemonic:
+ * @label: The text of the button, with an underscore in front of the
+ * mnemonic character
+ *
+ * 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.
+ *
+ * Returns: a new #GtkCheckButton
+ */
+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,
+ cairo_t *cr)
{
- GtkButton *button;
- GtkCheckButton *check_button;
- GdkRectangle child_area;
+ GtkCheckButton *check_button = GTK_CHECK_BUTTON (widget);
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
- g_return_if_fail (area != NULL);
+ gtk_check_button_draw_indicator (check_button, cr);
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
+ if (gtk_widget_has_visible_focus (widget))
{
- check_button = GTK_CHECK_BUTTON (widget);
-
- if (check_button->toggle_button.draw_indicator)
- {
- button = GTK_BUTTON (widget);
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget));
+ GtkStyleContext *context;
+ GtkAllocation allocation;
+ gint border_width;
+ gint interior_focus;
+ gint focus_width;
+ gint focus_pad;
+
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+ gtk_widget_style_get (widget,
+ "interior-focus", &interior_focus,
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
+
+ gtk_widget_get_allocation (widget, &allocation);
+ context = gtk_widget_get_style_context (widget);
+
+ if (interior_focus && child && gtk_widget_get_visible (child))
+ {
+ GtkAllocation child_allocation;
+
+ gtk_widget_get_allocation (child, &child_allocation);
+ gtk_render_focus (context, cr,
+ child_allocation.x - allocation.x - focus_width - focus_pad,
+ child_allocation.y - allocation.y - focus_width - focus_pad,
+ child_allocation.width + 2 * (focus_width + focus_pad),
+ child_allocation.height + 2 * (focus_width + focus_pad));
+ }
+ else
+ gtk_render_focus (context, cr,
+ border_width, border_width,
+ allocation.width - 2 * border_width,
+ allocation.height - 2 * border_width);
+ }
+}
- gtk_check_button_draw_indicator (check_button, area);
+void
+_gtk_check_button_get_props (GtkCheckButton *check_button,
+ gint *indicator_size,
+ gint *indicator_spacing)
+{
+ GtkWidget *widget = GTK_WIDGET (check_button);
- if (button->child && GTK_WIDGET_NO_WINDOW (button->child) &&
- gtk_widget_intersect (button->child, area, &child_area))
- gtk_widget_draw (button->child, &child_area);
+ if (indicator_size)
+ gtk_widget_style_get (widget, "indicator-size", indicator_size, NULL);
- gtk_widget_draw_focus (widget);
- }
- else
- {
- if (GTK_WIDGET_CLASS (parent_class)->draw)
- (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
- }
- }
+ if (indicator_spacing)
+ gtk_widget_style_get (widget, "indicator-spacing", indicator_spacing, NULL);
}
static void
-gtk_check_button_draw_focus (GtkWidget *widget)
+gtk_check_button_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
- GtkCheckButton *check_button;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
+ GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_toggle_button_get_mode (toggle_button))
{
- check_button = GTK_CHECK_BUTTON (widget);
- if (check_button->toggle_button.draw_indicator)
- {
- gint border_width;
-
- border_width = GTK_CONTAINER (widget)->border_width;
- if (GTK_WIDGET_HAS_FOCUS (widget))
- gdk_draw_rectangle (widget->window,
- widget->style->black_gc, FALSE,
- border_width, border_width,
- widget->allocation.width - 2 * border_width - 1,
- widget->allocation.height - 2 * border_width - 1);
- else
- gdk_draw_rectangle (widget->window,
- widget->style->bg_gc[GTK_STATE_NORMAL], FALSE,
- border_width, border_width,
- widget->allocation.width - 2 * border_width - 1,
- widget->allocation.height - 2 * border_width - 1);
- }
- else
- {
- if (GTK_WIDGET_CLASS (parent_class)->draw_focus)
- (* GTK_WIDGET_CLASS (parent_class)->draw_focus) (widget);
- }
+ GtkWidget *child;
+ gint indicator_size;
+ gint indicator_spacing;
+ gint focus_width;
+ gint focus_pad;
+ guint border_width;
+
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+ gtk_widget_style_get (GTK_WIDGET (widget),
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
+ *minimum = 2 * border_width;
+ *natural = 2 * border_width;
+
+ _gtk_check_button_get_props (GTK_CHECK_BUTTON (widget),
+ &indicator_size, &indicator_spacing);
+
+ child = gtk_bin_get_child (GTK_BIN (widget));
+ if (child && gtk_widget_get_visible (child))
+ {
+ gint child_min, child_nat;
+
+ gtk_widget_get_preferred_width (child, &child_min, &child_nat);
+
+ *minimum += child_min + indicator_spacing;
+ *natural += child_nat + indicator_spacing;
+ }
+
+ *minimum += (indicator_size + indicator_spacing * 2 + 2 * (focus_width + focus_pad));
+ *natural += (indicator_size + indicator_spacing * 2 + 2 * (focus_width + focus_pad));
}
+ else
+ GTK_WIDGET_CLASS (gtk_check_button_parent_class)->get_preferred_width (widget, minimum, natural);
}
static void
-gtk_check_button_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+gtk_check_button_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
- GtkCheckButton *check_button;
- GtkButton *button;
- gint temp;
+ GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (widget);
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
- g_return_if_fail (requisition != NULL);
+ if (gtk_toggle_button_get_mode (toggle_button))
+ {
+ GtkWidget *child;
+ gint temp;
+ gint indicator_size;
+ gint indicator_spacing;
+ gint focus_width;
+ gint focus_pad;
+ guint border_width;
- check_button = GTK_CHECK_BUTTON (widget);
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
- if (GTK_WIDGET_CLASS (parent_class)->size_request)
- (* GTK_WIDGET_CLASS (parent_class)->size_request) (widget, requisition);
+ gtk_widget_style_get (GTK_WIDGET (widget),
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
- if (check_button->toggle_button.draw_indicator)
- {
- button = GTK_BUTTON (widget);
+ *minimum = border_width * 2;
+ *natural = border_width * 2;
+
+ _gtk_check_button_get_props (GTK_CHECK_BUTTON (widget),
+ &indicator_size, &indicator_spacing);
- requisition->width += (CHECK_BUTTON_CLASS (widget)->indicator_size +
- CHECK_BUTTON_CLASS (widget)->indicator_spacing * 3 + 2);
+ child = gtk_bin_get_child (GTK_BIN (widget));
+ if (child && gtk_widget_get_visible (child))
+ {
+ gint child_min, child_nat;
- temp = (CHECK_BUTTON_CLASS (widget)->indicator_size +
- CHECK_BUTTON_CLASS (widget)->indicator_spacing * 2);
- requisition->height = MAX (requisition->height, temp) + 2;
+ gtk_widget_get_preferred_height (child, &child_min, &child_nat);
+
+ *minimum += child_min;
+ *natural += child_nat;
+ }
+
+ temp = indicator_size + indicator_spacing * 2;
+ *minimum = MAX (*minimum, temp) + 2 * (focus_width + focus_pad);
+ *natural = MAX (*natural, temp) + 2 * (focus_width + focus_pad);
}
+ else
+ GTK_WIDGET_CLASS (gtk_check_button_parent_class)->get_preferred_height (widget, minimum, natural);
}
static void
GtkAllocation *allocation)
{
GtkCheckButton *check_button;
+ 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);
- if (check_button->toggle_button.draw_indicator)
+ toggle_button = GTK_TOGGLE_BUTTON (widget);
+
+ if (gtk_toggle_button_get_mode (toggle_button))
{
- widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
- gdk_window_move_resize (widget->window,
+ GtkWidget *child;
+ 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);
+
+ gtk_widget_set_allocation (widget, allocation);
+
+ if (gtk_widget_get_realized (widget))
+ gdk_window_move_resize (gtk_button_get_event_window (button),
allocation->x, allocation->y,
allocation->width, allocation->height);
- button = GTK_BUTTON (widget);
-
- if (button->child && GTK_WIDGET_VISIBLE (button->child))
+ child = gtk_bin_get_child (GTK_BIN (button));
+ if (child && gtk_widget_get_visible (child))
{
- child_allocation.x = (GTK_CONTAINER (widget)->border_width +
- CHECK_BUTTON_CLASS (widget)->indicator_size +
- CHECK_BUTTON_CLASS (widget)->indicator_spacing * 3 + 1);
- child_allocation.y = GTK_CONTAINER (widget)->border_width + 1;
- child_allocation.width = MAX (0, allocation->width - child_allocation.x -
- GTK_CONTAINER (widget)->border_width - 1);
- child_allocation.height = MAX (0, allocation->height - child_allocation.y * 2);
-
- gtk_widget_size_allocate (button->child, &child_allocation);
+ guint border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+ child_allocation.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 = 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 +
+ allocation->x + focus_width + focus_pad);
+ child_allocation.y = 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 (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)
+gtk_check_button_draw (GtkWidget *widget,
+ cairo_t *cr)
{
- GtkButton *button;
- GtkCheckButton *check_button;
- 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);
+ GtkToggleButton *toggle_button;
+ GtkBin *bin;
+ GtkWidget *child;
+
+ toggle_button = GTK_TOGGLE_BUTTON (widget);
+ bin = GTK_BIN (widget);
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
+ if (gtk_toggle_button_get_mode (toggle_button))
{
- check_button = GTK_CHECK_BUTTON (widget);
-
- if (check_button->toggle_button.draw_indicator)
- {
- button = GTK_BUTTON (widget);
-
- gtk_check_button_draw_indicator (check_button, &event->area);
+ gtk_check_button_paint (widget, cr);
- child_event = *event;
- if (button->child && GTK_WIDGET_NO_WINDOW (button->child) &&
- gtk_widget_intersect (button->child, &event->area, &child_event.area))
- gtk_widget_event (button->child, (GdkEvent*) &child_event);
-
- gtk_widget_draw_focus (widget);
- }
- else
- {
- if (GTK_WIDGET_CLASS (parent_class)->expose_event)
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
- }
+ child = gtk_bin_get_child (bin);
+ if (child)
+ gtk_container_propagate_draw (GTK_CONTAINER (widget),
+ child,
+ cr);
}
+ else if (GTK_WIDGET_CLASS (gtk_check_button_parent_class)->draw)
+ GTK_WIDGET_CLASS (gtk_check_button_parent_class)->draw (widget, cr);
return FALSE;
}
static void
gtk_check_button_draw_indicator (GtkCheckButton *check_button,
- GdkRectangle *area)
+ cairo_t *cr)
{
- GtkCheckButtonClass *class;
-
- g_return_if_fail (check_button != NULL);
- g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
- g_return_if_fail (CHECK_BUTTON_CLASS (check_button) != NULL);
-
- class = CHECK_BUTTON_CLASS (check_button);
+ GtkCheckButtonClass *class = GTK_CHECK_BUTTON_GET_CLASS (check_button);
if (class->draw_indicator)
- (* class->draw_indicator) (check_button, area);
+ class->draw_indicator (check_button, cr);
}
static void
gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
- GdkRectangle *area)
+ cairo_t *cr)
{
GtkWidget *widget;
+ GtkWidget *child;
+ GtkButton *button;
GtkToggleButton *toggle_button;
- GtkStateType state_type;
- GtkShadowType shadow_type;
- GdkRectangle restrict_area;
- GdkRectangle new_area;
- gint width, height;
+ GtkStateFlags state = 0;
gint x, y;
+ gint indicator_size;
+ gint indicator_spacing;
+ gint focus_width;
+ gint focus_pad;
+ guint border_width;
+ gboolean interior_focus;
+ GtkAllocation allocation;
+ GtkStyleContext *context;
- g_return_if_fail (check_button != NULL);
- g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
+ widget = GTK_WIDGET (check_button);
+ button = GTK_BUTTON (check_button);
+ toggle_button = GTK_TOGGLE_BUTTON (check_button);
- if (GTK_WIDGET_DRAWABLE (check_button))
- {
- widget = GTK_WIDGET (check_button);
- toggle_button = GTK_TOGGLE_BUTTON (check_button);
+ gtk_widget_get_allocation (widget, &allocation);
+ context = gtk_widget_get_style_context (widget);
+ state = gtk_widget_get_state_flags (widget);
- state_type = GTK_WIDGET_STATE (widget);
- if ((state_type != GTK_STATE_NORMAL) &&
- (state_type != GTK_STATE_PRELIGHT))
- state_type = GTK_STATE_NORMAL;
+ gtk_widget_style_get (widget,
+ "interior-focus", &interior_focus,
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
- restrict_area.x = GTK_CONTAINER (widget)->border_width;
- restrict_area.y = restrict_area.x;
- restrict_area.width = widget->allocation.width - restrict_area.x * 2;
- restrict_area.height = widget->allocation.height - restrict_area.x * 2;
+ _gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing);
- if (gdk_rectangle_intersect (area, &restrict_area, &new_area))
- {
- gtk_style_set_background (widget->style, widget->window, state_type);
- gdk_window_clear_area (widget->window, new_area.x, new_area.y,
- new_area.width, new_area.height);
- }
-
- x = CHECK_BUTTON_CLASS (widget)->indicator_spacing + GTK_CONTAINER (widget)->border_width;
- 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;
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
- if (GTK_TOGGLE_BUTTON (widget)->active)
- shadow_type = GTK_SHADOW_IN;
- else
- shadow_type = GTK_SHADOW_OUT;
-
- gdk_draw_rectangle (widget->window,
- widget->style->bg_gc[GTK_WIDGET_STATE (widget)],
- TRUE, x + 1, y + 1, width, height);
- gtk_draw_shadow (widget->style, widget->window,
- GTK_WIDGET_STATE (widget), shadow_type,
- x + 1, y + 1, width, height);
- }
+ x = indicator_spacing + border_width;
+ y = (allocation.height - indicator_size) / 2;
+
+ child = gtk_bin_get_child (GTK_BIN (check_button));
+ if (!interior_focus || !(child && gtk_widget_get_visible (child)))
+ x += focus_width + focus_pad;
+
+ state &= ~(GTK_STATE_FLAG_INCONSISTENT |
+ GTK_STATE_FLAG_ACTIVE |
+ GTK_STATE_FLAG_SELECTED |
+ GTK_STATE_FLAG_PRELIGHT);
+
+ if (gtk_toggle_button_get_inconsistent (toggle_button))
+ state |= GTK_STATE_FLAG_INCONSISTENT;
+ else if (gtk_toggle_button_get_active (toggle_button) ||
+ (button->priv->button_down && button->priv->in_button))
+ state |= GTK_STATE_FLAG_ACTIVE;
+
+ if (button->priv->activate_timeout || (button->priv->button_down && button->priv->in_button))
+ state |= GTK_STATE_FLAG_SELECTED;
+
+ if (button->priv->in_button)
+ state |= GTK_STATE_FLAG_PRELIGHT;
+
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ x = allocation.width - (indicator_size + x);
+
+ gtk_style_context_save (context);
+ gtk_style_context_set_state (context, state);
+
+ if (state & GTK_STATE_FLAG_PRELIGHT)
+ gtk_render_background (context, cr,
+ border_width, border_width,
+ allocation.width - (2 * border_width),
+ allocation.height - (2 * border_width));
+
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_CHECK);
+
+ gtk_render_check (context, cr,
+ x, y, indicator_size, indicator_size);
+
+ gtk_style_context_restore (context);
}
projects / ~andy / gtk / blobdiff