From 720464327c1bc69297b21b70918cc93624be1dd0 Mon Sep 17 00:00:00 2001
From: Přemysl Eric Janouch <p@janouch.name>
Date: Tue, 28 Dec 2021 01:05:07 +0100
Subject: Clean up

---
 fiv-browser.c | 11 +++++------
 fiv-io.c      |  7 ++-----
 fiv-io.h      |  4 ++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/fiv-browser.c b/fiv-browser.c
index ab085f7..84828d2 100644
--- a/fiv-browser.c
+++ b/fiv-browser.c
@@ -66,8 +66,6 @@ typedef struct entry Entry;
 typedef struct item Item;
 typedef struct row Row;
 
-static const double g_permitted_width_multiplier = 2;
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 struct entry {
@@ -305,8 +303,8 @@ rescale_thumbnail(cairo_surface_t *thumbnail, double row_height)
 
 	double scale_x = 1;
 	double scale_y = 1;
-	if (width > g_permitted_width_multiplier * height) {
-		scale_x = g_permitted_width_multiplier * row_height / width;
+	if (width > FIV_IO_WIDE_THUMBNAIL_COEFFICIENT * height) {
+		scale_x = FIV_IO_WIDE_THUMBNAIL_COEFFICIENT * row_height / width;
 		scale_y = round(scale_x * height) / height;
 	} else {
 		scale_y = row_height / height;
@@ -823,8 +821,9 @@ fiv_browser_get_preferred_width(GtkWidget *widget, gint *minimum, gint *natural)
 
 	GtkBorder padding = {};
 	gtk_style_context_get_padding(style, GTK_STATE_FLAG_NORMAL, &padding);
-	*minimum = *natural = g_permitted_width_multiplier * self->item_height +
-		padding.left + 2 * self->item_border_x + padding.right;
+	*minimum = *natural =
+		FIV_IO_WIDE_THUMBNAIL_COEFFICIENT * self->item_height + padding.left +
+		2 * self->item_border_x + padding.right;
 }
 
 static void
diff --git a/fiv-io.c b/fiv-io.c
index dea5de9..eed6dfb 100644
--- a/fiv-io.c
+++ b/fiv-io.c
@@ -2763,9 +2763,6 @@ FivIoThumbnailSizeInfo
 		FIV_IO_THUMBNAIL_SIZES(XX)};
 #undef XX
 
-// TODO(p): Put the constant in a header file, share with fiv-browser.c.
-static const double g_wide_thumbnail_factor = 2;
-
 static void
 mark_thumbnail_lq(cairo_surface_t *surface)
 {
@@ -2793,8 +2790,8 @@ rescale_thumbnail(cairo_surface_t *thumbnail, double row_height)
 
 	double scale_x = 1;
 	double scale_y = 1;
-	if (width > g_wide_thumbnail_factor * height) {
-		scale_x = g_wide_thumbnail_factor * row_height / width;
+	if (width > FIV_IO_WIDE_THUMBNAIL_COEFFICIENT * height) {
+		scale_x = FIV_IO_WIDE_THUMBNAIL_COEFFICIENT * row_height / width;
 		scale_y = round(scale_x * height) / height;
 	} else {
 		scale_y = row_height / height;
diff --git a/fiv-io.h b/fiv-io.h
index 5ce0c1c..97f4fa7 100644
--- a/fiv-io.h
+++ b/fiv-io.h
@@ -134,6 +134,10 @@ typedef struct _FivIoThumbnailSizeInfo {
 extern FivIoThumbnailSizeInfo
 	fiv_io_thumbnail_sizes[FIV_IO_THUMBNAIL_SIZE_COUNT];
 
+enum {
+	FIV_IO_WIDE_THUMBNAIL_COEFFICIENT = 2
+};
+
 /// Returns this user's root thumbnail directory.
 gchar *fiv_io_get_thumbnail_root(void);
 
-- 
cgit v1.2.3-54-g00ecf