AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

checkbutton: Add a 'grouped' style class

Browse Source 
This will make it easier for themes to style radio buttons
differently from check buttons, since out CSS does not have
:has().

The concrete desire here is to use a different outline for
the focus rectangle.

Update affected tests.

Fixes: #6936
This commit is contained in:
Matthias Clasen 2024-08-17 07:25:09 -04:00
parent c3c1819e12
commit 5af2d95bff
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gtk/gtkcheckbutton.c
View File

@ -89,7 +89,7 @@
* # CSS nodes * # CSS nodes
* *
* ``` * ```
* checkbutton[.text-button] * checkbutton[.text-button][.grouped]
* ├── check * ├── check
* ╰── [label] * ╰── [label]
* ``` * ```
@ -170,17 +170,37 @@ gtk_check_button_dispose (GObject *object)
G_OBJECT_CLASS (gtk_check_button_parent_class)->dispose (object); G_OBJECT_CLASS (gtk_check_button_parent_class)->dispose (object);
} }
static void
update_button_role (GtkCheckButton *self,
GtkButtonRole role)
{
GtkCheckButtonPrivate *priv = gtk_check_button_get_instance_private (self);
if (priv->indicator_widget == NULL)
return;
if (role == GTK_BUTTON_ROLE_RADIO)
{
gtk_css_node_set_name (gtk_widget_get_css_node (priv->indicator_widget),
g_quark_from_static_string ("radio"));
gtk_widget_add_css_class (GTK_WIDGET (self), "grouped");
}
else
{
gtk_css_node_set_name (gtk_widget_get_css_node (priv->indicator_widget),
g_quark_from_static_string ("check"));
gtk_widget_remove_css_class (GTK_WIDGET (self), "grouped");
}
}
static void static void
button_role_changed (GtkCheckButton *self) button_role_changed (GtkCheckButton *self)
{ {
GtkCheckButtonPrivate *priv = gtk_check_button_get_instance_private (self); GtkCheckButtonPrivate *priv = gtk_check_button_get_instance_private (self);
if (gtk_action_helper_get_role (priv->action_helper) == GTK_BUTTON_ROLE_RADIO) update_button_role (self, gtk_action_helper_get_role (priv->action_helper));
gtk_css_node_set_name (gtk_widget_get_css_node (priv->indicator_widget),
g_quark_from_static_string("radio"));
else
gtk_css_node_set_name (gtk_widget_get_css_node (priv->indicator_widget),
g_quark_from_static_string("check"));
} }
static void static void
@ -1033,9 +1053,7 @@ gtk_check_button_set_group (GtkCheckButton *self,
priv->group_next = NULL; priv->group_next = NULL;
priv->group_prev = NULL; priv->group_prev = NULL;
if (priv->indicator_widget) update_button_role (self, GTK_BUTTON_ROLE_CHECK);
gtk_css_node_set_name (gtk_widget_get_css_node (priv->indicator_widget),
g_quark_from_static_string("check"));
return; return;
} }
@ -1057,12 +1075,8 @@ gtk_check_button_set_group (GtkCheckButton *self,
group_priv->group_prev = self; group_priv->group_prev = self;
priv->group_next = group; priv->group_next = group;
if (priv->indicator_widget) update_button_role (self, GTK_BUTTON_ROLE_RADIO);
gtk_css_node_set_name (gtk_widget_get_css_node (priv->indicator_widget), update_button_role (group, GTK_BUTTON_ROLE_RADIO);
g_quark_from_static_string("radio"));
gtk_css_node_set_name (gtk_widget_get_css_node (group_priv->indicator_widget),
g_quark_from_static_string("radio"));
g_object_notify_by_pspec (G_OBJECT (self), props[PROP_GROUP]); g_object_notify_by_pspec (G_OBJECT (self), props[PROP_GROUP]);
} }

4
testsuite/css/nodes/buttons.nodes
View File

@ -5,10 +5,10 @@ window.background:dir(ltr)
checkbutton.text-button:dir(ltr) checkbutton.text-button:dir(ltr)
check:dir(ltr) check:dir(ltr)
label:dir(ltr) label:dir(ltr)
checkbutton.text-button:dir(ltr):checked checkbutton.grouped.text-button:dir(ltr):checked
radio:dir(ltr):checked radio:dir(ltr):checked
label:dir(ltr) label:dir(ltr)
checkbutton.text-button:dir(ltr) checkbutton.grouped.text-button:dir(ltr)
radio:dir(ltr) radio:dir(ltr)
label:dir(ltr) label:dir(ltr)
switch:dir(ltr):checked switch:dir(ltr):checked