From 02f2cecf9094797ac9d03dd5ef9802a37c43ddcd Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 24 Oct 2018 15:07:42 +0100
Subject: [PATCH] Set the geometry hints on the GdkWindow

This ensures the hints are not modified by Gtk+ on the fly.
---
 src/desktop/desktopiconwindow.c | 39 +++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/desktop/desktopiconwindow.c b/src/desktop/desktopiconwindow.c
index ef38699..b566376 100644
--- a/src/desktop/desktopiconwindow.c
+++ b/src/desktop/desktopiconwindow.c
@@ -54,15 +54,12 @@ struct _DesktopIconWindow
 /* functions */
 /* desktopiconwindow_new */
 static gboolean _on_desktopiconwindow_closex(void);
+static void _on_desktopiconwindow_realize(GtkWidget * widget, gpointer data);
 
 DesktopIconWindow * desktopiconwindow_new(DesktopIcon * icon)
 {
 	DesktopIconWindow * window;
 	GtkWindow * w;
-	GdkGeometry geometry;
-	/* XXX check */
-	const unsigned int hints = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE
-		| GDK_HINT_BASE_SIZE;
 	GtkWidget * widget;
 
 #ifdef DEBUG
@@ -87,14 +84,8 @@ DesktopIconWindow * desktopiconwindow_new(DesktopIcon * icon)
 #endif
 	g_signal_connect(window->widget, "delete-event", G_CALLBACK(
 				_on_desktopiconwindow_closex), NULL);
-	memset(&geometry, 0, sizeof(geometry));
-	geometry.min_width = DESKTOPICON_MIN_WIDTH;
-	geometry.min_height = DESKTOPICON_MIN_HEIGHT;
-	geometry.max_width = DESKTOPICON_MAX_WIDTH;
-	geometry.max_height = DESKTOPICON_MAX_HEIGHT;
-	geometry.base_width = DESKTOPICON_MIN_WIDTH;
-	geometry.base_height = DESKTOPICON_MIN_HEIGHT;
-	gtk_window_set_geometry_hints(w, NULL, &geometry, hints);
+	g_signal_connect(window->widget, "realize", G_CALLBACK(
+				_on_desktopiconwindow_realize), window);
 	/* icon */
 	widget = desktopicon_get_widget(icon);
 	gtk_container_add(GTK_CONTAINER(window->widget), widget);
@@ -108,6 +99,30 @@ static gboolean _on_desktopiconwindow_closex(void)
 	return TRUE;
 }
 
+static void _on_desktopiconwindow_realize(GtkWidget * widget, gpointer data)
+{
+	DesktopIconWindow * window = data;
+	GdkWindow * w;
+	GdkGeometry geometry;
+	/* XXX check */
+	const unsigned int hints = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE;
+
+#ifdef DEBUG
+	fprintf(stderr, "DEBUG: %s()\n", __func__);
+#endif
+	memset(&geometry, 0, sizeof(geometry));
+	geometry.min_width = DESKTOPICON_MIN_WIDTH;
+	geometry.min_height = DESKTOPICON_MIN_HEIGHT;
+	geometry.max_width = DESKTOPICON_MAX_WIDTH;
+	geometry.max_height = DESKTOPICON_MAX_HEIGHT;
+#if GTK_CHECK_VERSION(2, 14, 0)
+	w = gtk_widget_get_window(window->widget);
+#else
+	w = window->window;
+#endif
+	gdk_window_set_geometry_hints(w, &geometry, hints);
+}
+
 
 /* desktopiconwindow_delete */
 void desktopiconwindow_delete(DesktopIconWindow * window)