summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-09-19 10:25:45 -0400
committerMatthias Clasen <mclasen@redhat.com>2020-09-19 10:25:45 -0400
commita9bf129286bd91904d117a459362f733fd70f5a5 (patch)
tree407904bd17c1b02e86b566224b8ff20adc0c80f7
parent76b7f0ca1ce22a89665cbba00a3f8d45d27de4c2 (diff)
downloadgtk+-a9bf129286bd91904d117a459362f733fd70f5a5.tar.gz
fontchooser: Don't show "No fonts" prematurely
Don't switch to the empty page while we are still busy filtering. Fonts might yet appear.
-rw-r--r--gtk/gtkfontchooserwidget.c3
-rw-r--r--gtk/ui/gtkfontchooserwidget.ui1
2 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index 681466714b..ede2ce8bf4 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -774,7 +774,8 @@ rows_changed_cb (GtkFontChooserWidget *self)
{
const char *page;
- if (g_list_model_get_n_items (G_LIST_MODEL (self->selection)) == 0)
+ if (g_list_model_get_n_items (G_LIST_MODEL (self->selection)) == 0 &&
+ gtk_filter_list_model_get_pending (GTK_FILTER_LIST_MODEL (self->filter_model)) == 0)
page = "empty";
else
page = "list";
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index c3933c84b2..96c259687e 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -5,6 +5,7 @@
<signal name="items-changed" handler="rows_changed_cb" object="GtkFontChooserWidget" swapped="1" />
<property name="model">
<object class="GtkFilterListModel" id="filter_model">
+ <signal name="notify::pending" handler="rows_changed_cb" object="GtkFontChooserWidget" swapped="1" />
<property name="incremental">1</property>
<property name="filter">
<object class="GtkEveryFilter">