From 19fa7d513d1f6dd71a4c87957f3bae4f9531ea87 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 5 May 2022 12:31:51 -0400 Subject: [PATCH 1/2] theme: Fix editable label selection When the editable label is in editing mode, selections should appear the same as in other entries. --- gtk/theme/Default/_common.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gtk/theme/Default/_common.scss b/gtk/theme/Default/_common.scss index 89aa344683..fc0f75c5aa 100644 --- a/gtk/theme/Default/_common.scss +++ b/gtk/theme/Default/_common.scss @@ -468,6 +468,15 @@ treeview entry { *******************/ editablelabel > stack > text { @include entry(normal); + + > selection { + background-color: $backdrop_selected_bg_color; + color: transparent; + &:focus-within { + background-color: $selected_text_bg_color; + color: $fg_color; + } + } } /*********** From 25069cf2334382e7c07964d480f6cf365472a647 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 5 May 2022 12:43:23 -0400 Subject: [PATCH 2/2] editablelabel: Make :editing writable This does not hurt, and lets us start editing from a ui file, which is useful for documentation screenshots. --- gtk/gtkeditablelabel.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gtk/gtkeditablelabel.c b/gtk/gtkeditablelabel.c index b75b6a531d..a5331cc09c 100644 --- a/gtk/gtkeditablelabel.c +++ b/gtk/gtkeditablelabel.c @@ -302,6 +302,13 @@ gtk_editable_label_set_property (GObject *object, switch (prop_id) { + case PROP_EDITING: + if (g_value_get_boolean (value)) + gtk_editable_label_start_editing (self); + else + gtk_editable_label_stop_editing (self, FALSE); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -371,7 +378,7 @@ gtk_editable_label_class_init (GtkEditableLabelClass *class) P_("Editing"), P_("Whether the widget is in editing mode"), FALSE, - GTK_PARAM_READABLE); + GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);