AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 14:30:15 +00:00
Code Issues Projects Releases Wiki Activity

radiobutton: Use the widget state flags as a base for drawing

Browse Source
This commit is contained in:
Rui Matos 2011-12-21 14:20:02 +00:00
parent c98e9c94e7
commit 6dd0bd5536
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkradiobutton.c
View File

@ -911,6 +911,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
button = GTK_BUTTON (check_button); button = GTK_BUTTON (check_button);
toggle_button = GTK_TOGGLE_BUTTON (check_button); toggle_button = GTK_TOGGLE_BUTTON (check_button);
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
@ -931,6 +932,11 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
if (!interior_focus || !(child && gtk_widget_get_visible (child))) if (!interior_focus || !(child && gtk_widget_get_visible (child)))
x += focus_width + focus_pad; 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)) if (gtk_toggle_button_get_inconsistent (toggle_button))
state |= GTK_STATE_FLAG_INCONSISTENT; state |= GTK_STATE_FLAG_INCONSISTENT;
else if (gtk_toggle_button_get_active (toggle_button)) else if (gtk_toggle_button_get_active (toggle_button))
@ -940,10 +946,8 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
(button->priv->button_down && button->priv->in_button)) (button->priv->button_down && button->priv->in_button))
state |= GTK_STATE_FLAG_SELECTED; state |= GTK_STATE_FLAG_SELECTED;
if (button->priv->in_button) if (button->priv->in_button && !(state & GTK_STATE_FLAG_INSENSITIVE))
state |= GTK_STATE_FLAG_PRELIGHT; state |= GTK_STATE_FLAG_PRELIGHT;
else if (!gtk_widget_is_sensitive (widget))
state |= GTK_STATE_FLAG_INSENSITIVE;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
x = allocation.width - (indicator_size + x); x = allocation.width - (indicator_size + x);