From 21d1100ba9df3c7c25e7c3ea9edccf0c2b3466f9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 16 Jan 2025 21:25:15 -0500 Subject: [PATCH] gtk-demo: Make the settings demos set settings It wasn't working before. Fixes: #7228 --- demos/gtk-demo/listview_settings.c | 3 +++ demos/gtk-demo/listview_settings.ui | 2 +- demos/gtk-demo/listview_settings2.c | 14 +++++++------- demos/gtk-demo/listview_settings2.ui | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/demos/gtk-demo/listview_settings.c b/demos/gtk-demo/listview_settings.c index 6a7779ba12b..c88fbce1661 100644 --- a/demos/gtk-demo/listview_settings.c +++ b/demos/gtk-demo/listview_settings.c @@ -30,6 +30,9 @@ item_value_changed (GtkEditableLabel *label, const char *name; char *value; + if (gtk_editable_label_get_editing (label)) + return; + text = gtk_editable_get_text (GTK_EDITABLE (label)); self = gtk_column_view_cell_get_item (cell); diff --git a/demos/gtk-demo/listview_settings.ui b/demos/gtk-demo/listview_settings.ui index bd007a93c7d..1304edadd8d 100644 --- a/demos/gtk-demo/listview_settings.ui +++ b/demos/gtk-demo/listview_settings.ui @@ -126,7 +126,7 @@ GtkColumnViewCell - + diff --git a/demos/gtk-demo/listview_settings2.c b/demos/gtk-demo/listview_settings2.c index 1b4820cf716..0a9ff92760c 100644 --- a/demos/gtk-demo/listview_settings2.c +++ b/demos/gtk-demo/listview_settings2.c @@ -14,9 +14,9 @@ #include "settings-key.h" static void -item_value_changed (GtkEditableLabel *label, - GParamSpec *pspec, - GtkColumnViewCell *cell) +item_value_changed (GtkEntry *entry, + GParamSpec *pspec, + GtkListItem *item) { SettingsKey *self; GSettingsSchemaKey *key; @@ -27,9 +27,9 @@ item_value_changed (GtkEditableLabel *label, const char *name; char *value; - text = gtk_editable_get_text (GTK_EDITABLE (label)); + text = gtk_editable_get_text (GTK_EDITABLE (entry)); - self = gtk_column_view_cell_get_item (cell); + self = gtk_list_item_get_item (item); key = settings_key_get_key (self); type = g_settings_schema_key_get_value_type (key); @@ -54,10 +54,10 @@ item_value_changed (GtkEditableLabel *label, return; revert: - gtk_widget_error_bell (GTK_WIDGET (label)); + gtk_widget_error_bell (GTK_WIDGET (entry)); g_object_get (self, "value", &value, NULL); - gtk_editable_set_text (GTK_EDITABLE (label), value); + gtk_editable_set_text (GTK_EDITABLE (entry), value); g_free (value); } diff --git a/demos/gtk-demo/listview_settings2.ui b/demos/gtk-demo/listview_settings2.ui index aaba281354f..826644adaff 100644 --- a/demos/gtk-demo/listview_settings2.ui +++ b/demos/gtk-demo/listview_settings2.ui @@ -87,7 +87,7 @@ GtkListItem - + -- GitLab