Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modelbutton: Use indicator state for button gadget if iconic

Browse Source
This commit is contained in:
Timm Bäder
2016-01-27 16:32:39 +01:00
parent 09677f7331
commit 299b32438d
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkmodelbutton.c
View File

@@ -197,9 +197,11 @@ static void
gtk_model_button_update_state (GtkModelButton *button)
{
GtkStateFlags state;
GtkStateFlags indicator_state;
GtkCssImageBuiltinType image_type = GTK_CSS_IMAGE_BUILTIN_NONE;
state = gtk_widget_get_state_flags (GTK_WIDGET (button));
indicator_state = state;
gtk_css_gadget_set_state (button->gadget, state);
@@ -207,12 +209,12 @@ gtk_model_button_update_state (GtkModelButton *button)
{
if (button->active && !button->menu_name)
{
state |= GTK_STATE_FLAG_CHECKED;
indicator_state |= GTK_STATE_FLAG_CHECKED;
image_type = GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED;
}
else
{
state &= ~GTK_STATE_FLAG_CHECKED;
indicator_state &= ~GTK_STATE_FLAG_CHECKED;
image_type = GTK_CSS_IMAGE_BUILTIN_CHECK;
}
}
@@ -220,12 +222,12 @@ gtk_model_button_update_state (GtkModelButton *button)
{
if (button->active && !button->menu_name)
{
state |= GTK_STATE_FLAG_CHECKED;
indicator_state |= GTK_STATE_FLAG_CHECKED;
image_type = GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED;
}
else
{
state &= ~GTK_STATE_FLAG_CHECKED;
indicator_state &= ~GTK_STATE_FLAG_CHECKED;
image_type = GTK_CSS_IMAGE_BUILTIN_OPTION;
}
}
@@ -239,7 +241,13 @@ gtk_model_button_update_state (GtkModelButton *button)
}
gtk_builtin_icon_set_image (GTK_BUILTIN_ICON (button->indicator_gadget), image_type);
gtk_css_gadget_set_state (button->indicator_gadget, state);
if (button->iconic)
gtk_css_gadget_set_state (button->gadget, indicator_state);
else
gtk_css_gadget_set_state (button->gadget, state);
gtk_css_gadget_set_state (button->indicator_gadget, indicator_state);
}
static void