From 96baf9769a0b3ca1c364708e58785c39499f6068 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 11 Jan 2021 14:38:18 -0500
Subject: [PATCH 1/5] about dialog: Remove manual icon sizing

We have icon theme code to do that for us.
---
 gtk/gtkaboutdialog.c | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 745b45ea9b..bff8e76432 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -1644,41 +1644,7 @@ gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
   if (gtk_image_get_storage_type (GTK_IMAGE (about->logo_image)) == GTK_IMAGE_PAINTABLE)
     g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LOGO]);
 
-  if (icon_name)
-    {
-      GtkIconTheme *icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (about)));
-      int *sizes = gtk_icon_theme_get_icon_sizes (icon_theme, icon_name);
-      int i, best_size = 0;
-
-      for (i = 0; sizes[i]; i++)
-        {
-          if (sizes[i] >= 128 || sizes[i] == -1)
-            {
-              best_size = 128;
-              break;
-            }
-          else if (sizes[i] >= 96)
-            {
-              best_size = MAX (96, best_size);
-            }
-          else if (sizes[i] >= 64)
-            {
-              best_size = MAX (64, best_size);
-            }
-          else
-            {
-              best_size = MAX (48, best_size);
-            }
-        }
-      g_free (sizes);
-
-      gtk_image_set_from_icon_name (GTK_IMAGE (about->logo_image), icon_name);
-      gtk_image_set_pixel_size (GTK_IMAGE (about->logo_image), best_size);
-    }
-  else
-    {
-      gtk_image_clear (GTK_IMAGE (about->logo_image));
-    }
+  gtk_image_set_from_icon_name (GTK_IMAGE (about->logo_image), icon_name);
 
   g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LOGO_ICON_NAME]);
 

From 1d40750a6045c2c03250d5594e30ef3773c9c32a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 11 Jan 2021 16:48:06 -0500
Subject: [PATCH 2/5] aboutdialog: Set a style class

Add the .aboutdialog style class to toplevel
widget of about dialogs, similar to what we
do for e.g. GtkAssistant.
---
 gtk/gtkaboutdialog.c     | 6 ++++++
 gtk/ui/gtkaboutdialog.ui | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index bff8e76432..4cdee36575 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -101,6 +101,12 @@
  *                        "title", _("About ExampleCode"),
  *                        NULL);
  * ]|
+ *
+ * # CSS nodes
+ *
+ * GtkAboutDialog has a single CSS node with the name window and style
+ * class .aboutdialog.
+
  */
 
 typedef struct
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index ab5fe44b32..bd69376d6a 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -2,6 +2,9 @@
 <interface domain="gtk40">
   <template class="GtkAboutDialog" parent="GtkWindow">
     <property name="resizable">0</property>
+    <style>
+      <class name="aboutdialog"/>
+    </style>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar1">
         <child type="title">

From beeedb51419c5dddd9e3bdfe4553531e7373b79e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 11 Jan 2021 17:49:08 -0500
Subject: [PATCH 3/5] aboutdialog: Set icon-size for the logo

Make it explicit that we want large icons here.
---
 gtk/ui/gtkaboutdialog.ui | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index bd69376d6a..5382941c81 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -35,6 +35,7 @@
             <child>
               <object class="GtkImage" id="logo_image">
                 <property name="icon-name">image-missing</property>
+                <property name="icon-size">large</property>
                 <style>
                   <class name="icon-dropshadow"/>
                 </style>

From 65eaf8e8c41867b18e56edccb0f2c7a11a698d4d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 11 Jan 2021 16:43:19 -0500
Subject: [PATCH 4/5] Adwaita: Make about dialog icons big

Use 128 as the icon size for the image widget
in about dialogs.
---
 gtk/theme/Adwaita/_common.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index fd4123b71b..b5094c68e6 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -200,6 +200,10 @@ window.assistant {
   }
 }
 
+window.aboutdialog image.large-icons {
+  -gtk-icon-size: 128px;
+}
+
 %osd,
 .osd {
   color: $osd_fg_color;

From 73fb28a0580b5a704bc3d71ed398abb4dd987e70 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 11 Jan 2021 16:37:55 -0500
Subject: [PATCH 5/5] iconhelper: Recreate the texture when needed

When the icon size changes, we want to reload themed
icons.

This was showing up as the GtkImage in about dialogs
getting a big size with the same small icon upon
changing -gtk-icon-size in the inspector.
---
 gtk/gtkiconhelper.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 39ccaf044b..54b06396f6 100644
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -348,7 +348,8 @@ gtk_icon_helper_invalidate_for_change (GtkIconHelper     *self,
                                        GtkCssStyleChange *change)
 {
   if (change == NULL ||
-      gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_ICON_TEXTURE))
+      gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_ICON_TEXTURE |
+                                            GTK_CSS_AFFECTS_ICON_SIZE))
     {
       /* Avoid the queue_resize in gtk_icon_helper_invalidate */
       g_clear_object (&self->paintable);