From c5d2d899301c14d867fced18fc2d4affbc0d5aff Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Sun, 9 May 2021 20:35:39 +0500 Subject: [PATCH 1/4] demo: Use more appropriate back/forward icons --- demos/gtk-demo/fishbowl.ui | 4 ++-- demos/gtk-demo/headerbar.c | 4 ++-- demos/gtk-demo/iconscroll.ui | 4 ++-- demos/widget-factory/widget-factory.ui | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui index 7f837e92a4..5d5a0985ae 100644 --- a/demos/gtk-demo/fishbowl.ui +++ b/demos/gtk-demo/fishbowl.ui @@ -13,13 +13,13 @@ - pan-start-symbolic + go-previous-symbolic - pan-end-symbolic + go-next-symbolic diff --git a/demos/gtk-demo/headerbar.c b/demos/gtk-demo/headerbar.c index dab3ccffa5..590343bd94 100644 --- a/demos/gtk-demo/headerbar.c +++ b/demos/gtk-demo/headerbar.c @@ -42,10 +42,10 @@ do_headerbar (GtkWidget *do_widget) box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_add_css_class (box, "linked"); button = gtk_button_new (); - gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-start-symbolic")); + gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("go-previous-symbolic")); gtk_box_append (GTK_BOX (box), button); button = gtk_button_new (); - gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-end-symbolic")); + gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("go-next-symbolic")); gtk_box_append (GTK_BOX (box), button); gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box); diff --git a/demos/gtk-demo/iconscroll.ui b/demos/gtk-demo/iconscroll.ui index 95d2452747..be4c4219ed 100644 --- a/demos/gtk-demo/iconscroll.ui +++ b/demos/gtk-demo/iconscroll.ui @@ -13,13 +13,13 @@ - pan-start-symbolic + go-previous-symbolic - pan-end-symbolic + go-next-symbolic diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index 485776c1ba..6800cffdd1 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -2606,12 +2606,12 @@ microphone-sensitivity-medium-symbolic - pan-start-symbolic + go-previous-symbolic - pan-end-symbolic + go-next-symbolic From 5d59415c2d0550de14e8dcd80f91cf9928781f1a Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Sun, 9 May 2021 20:52:48 +0500 Subject: [PATCH 2/4] test: Use more appropriate back/forward icons --- tests/testsplitheaders.ui | 4 ++-- tests/teststackedheaders.ui | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testsplitheaders.ui b/tests/testsplitheaders.ui index 867b5277ba..0662c8cf62 100644 --- a/tests/testsplitheaders.ui +++ b/tests/testsplitheaders.ui @@ -30,13 +30,13 @@ - < + go-previous-symbolic center - > + go-next-symbolic center diff --git a/tests/teststackedheaders.ui b/tests/teststackedheaders.ui index 6112f77de9..981553110f 100644 --- a/tests/teststackedheaders.ui +++ b/tests/teststackedheaders.ui @@ -32,7 +32,7 @@ - < + go-previous-symbolic center From 7ebd9291d97acad640cf1b4e7abda015c9861f0d Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Sun, 9 May 2021 20:53:05 +0500 Subject: [PATCH 3/4] demo: Ensure .image-button on header bar buttons --- demos/gtk-demo/font-features.ui | 6 +----- demos/gtk-demo/headerbar.c | 14 +++----------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui index 8997a5ac9e..340fecfdcb 100644 --- a/demos/gtk-demo/font-features.ui +++ b/demos/gtk-demo/font-features.ui @@ -10,12 +10,8 @@ 1 Reset + view-refresh-symbolic - - - view-refresh-symbolic - - diff --git a/demos/gtk-demo/headerbar.c b/demos/gtk-demo/headerbar.c index 590343bd94..d19837563f 100644 --- a/demos/gtk-demo/headerbar.c +++ b/demos/gtk-demo/headerbar.c @@ -18,8 +18,6 @@ do_headerbar (GtkWidget *do_widget) GtkWidget *header; GtkWidget *button; GtkWidget *box; - GtkWidget *image; - GIcon *icon; if (!window) { @@ -32,20 +30,14 @@ do_headerbar (GtkWidget *do_widget) header = gtk_header_bar_new (); - button = gtk_button_new (); - icon = g_themed_icon_new ("mail-send-receive-symbolic"); - image = gtk_image_new_from_gicon (icon); - g_object_unref (icon); - gtk_button_set_child (GTK_BUTTON (button), image); + button = gtk_button_new_from_icon_name ("mail-send-receive-symbolic"); gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_add_css_class (box, "linked"); - button = gtk_button_new (); - gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("go-previous-symbolic")); + button = gtk_button_new_from_icon_name ("go-previous-symbolic"); gtk_box_append (GTK_BOX (box), button); - button = gtk_button_new (); - gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("go-next-symbolic")); + button = gtk_button_new_from_icon_name ("go-next-symbolic"); gtk_box_append (GTK_BOX (box), button); gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box); From 43e33b29902b2e1203160ae8da76e8a0507939ca Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Sun, 9 May 2021 20:53:40 +0500 Subject: [PATCH 4/4] test: Ensure .image-button on header bar buttons --- tests/testheaderbar.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c index 16d16629bc..ebeb971794 100644 --- a/tests/testheaderbar.c +++ b/tests/testheaderbar.c @@ -439,7 +439,6 @@ change_header (GtkButton *button, gpointer data) GtkWidget *window = GTK_WIDGET (data); GtkWidget *label; GtkWidget *widget; - GtkWidget *image; GtkWidget *header; if (button && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) @@ -470,10 +469,8 @@ change_header (GtkButton *button, gpointer data) gtk_header_bar_pack_end (GTK_HEADER_BAR (header), widget); - widget= gtk_button_new (); - image = gtk_image_new_from_icon_name ("bookmark-new-symbolic"); + widget= gtk_button_new_from_icon_name ("bookmark-new-symbolic"); g_signal_connect (widget, "clicked", G_CALLBACK (on_bookmark_clicked), window); - gtk_button_set_child (GTK_BUTTON (widget), image); gtk_header_bar_pack_start (GTK_HEADER_BAR (header), widget); }