From 4043e1a18e65189599ef3dbad290fd2d52ca2137 Mon Sep 17 00:00:00 2001
From: Benedikt Heine <bebe@bebehei.de>
Date: Fri, 28 Dec 2018 17:56:06 +0100
Subject: [PATCH] Refactor pixbuf scaling into seperate method

---
 src/icon.c | 47 ++++++++++++++++++++++++++++-------------------
 src/icon.h | 11 +++++++++++
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/icon.c b/src/icon.c
index 8cdc194..7bf30aa 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -110,6 +110,33 @@ cairo_surface_t *gdk_pixbuf_to_cairo_surface(GdkPixbuf *pixbuf)
         return icon_surface;
 }
 
+GdkPixbuf *icon_pixbuf_scale(GdkPixbuf *pixbuf)
+{
+        ASSERT_OR_RET(pixbuf, NULL);
+
+        int w = gdk_pixbuf_get_width(pixbuf);
+        int h = gdk_pixbuf_get_height(pixbuf);
+        int larger = w > h ? w : h;
+        if (settings.max_icon_size && larger > settings.max_icon_size) {
+                int scaled_w = settings.max_icon_size;
+                int scaled_h = settings.max_icon_size;
+                if (w >= h)
+                        scaled_h = (settings.max_icon_size * h) / w;
+                else
+                        scaled_w = (settings.max_icon_size * w) / h;
+
+                GdkPixbuf *scaled = gdk_pixbuf_scale_simple(
+                                pixbuf,
+                                scaled_w,
+                                scaled_h,
+                                GDK_INTERP_BILINEAR);
+                g_object_unref(pixbuf);
+                pixbuf = scaled;
+        }
+
+        return pixbuf;
+}
+
 GdkPixbuf *get_pixbuf_from_file(const char *filename)
 {
         char *path = string_to_path(g_strdup(filename));
@@ -208,25 +235,7 @@ cairo_surface_t *icon_get_for_notification(const struct notification *n)
 
         ASSERT_OR_RET(pixbuf, NULL);
 
-        int w = gdk_pixbuf_get_width(pixbuf);
-        int h = gdk_pixbuf_get_height(pixbuf);
-        int larger = w > h ? w : h;
-        if (settings.max_icon_size && larger > settings.max_icon_size) {
-                int scaled_w = settings.max_icon_size;
-                int scaled_h = settings.max_icon_size;
-                if (w >= h)
-                        scaled_h = (settings.max_icon_size * h) / w;
-                else
-                        scaled_w = (settings.max_icon_size * w) / h;
-
-                GdkPixbuf *scaled = gdk_pixbuf_scale_simple(
-                                pixbuf,
-                                scaled_w,
-                                scaled_h,
-                                GDK_INTERP_BILINEAR);
-                g_object_unref(pixbuf);
-                pixbuf = scaled;
-        }
+        pixbuf = icon_pixbuf_scale(pixbuf);
 
         cairo_surface_t *ret = gdk_pixbuf_to_cairo_surface(pixbuf);
         g_object_unref(pixbuf);
diff --git a/src/icon.h b/src/icon.h
index a93b8ae..7b4e3e5 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -8,6 +8,17 @@
 
 cairo_surface_t *gdk_pixbuf_to_cairo_surface(GdkPixbuf *pixbuf);
 
+/**
+ * Scales the given GdkPixbuf if necessary according to the settings.
+ *
+ * @param pixbuf (nullable) The pixbuf, which may be too big.
+ *                          Takes ownership of the reference.
+ * @return the scaled version of the pixbuf. If scaling wasn't
+ *         necessary, it returns the same pixbuf. Transfers full
+ *         ownership of the reference.
+ */
+GdkPixbuf *icon_pixbuf_scale(GdkPixbuf *pixbuf);
+
 /** Retrieve an icon by its full filepath.
  *
  * @param filename A string representing a readable file path