From 512c1cf7b5e3bc8fb52a1e6a0c20b358cb2a5b66 Mon Sep 17 00:00:00 2001
From: Scoopta <scoopta@scoopta.email>
Date: Tue, 3 Mar 2020 00:04:53 -0800
Subject: [PATCH] Fixed percent sizing

---
 src/wofi.c | 48 ++++++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/wofi.c b/src/wofi.c
index 8bf5ae8..225c35c 100644
--- a/src/wofi.c
+++ b/src/wofi.c
@@ -1296,6 +1296,24 @@ static void get_output_pos(void* data, struct zxdg_output_v1* output, int32_t x,
 	node->y = y;
 }
 
+static gboolean do_percent_size(gpointer data) {
+	char** geo_str = data;
+	bool width_percent = strchr(geo_str[0], '%') != NULL;
+	bool height_percent = strchr(geo_str[1], '%') != NULL;
+	GdkMonitor* monitor = gdk_display_get_monitor_at_window(gdk_display_get_default(), gtk_widget_get_window(window));
+	GdkRectangle rect;
+	gdk_monitor_get_geometry(monitor, &rect);
+	if(width_percent) {
+		width = (width / 100.f) * rect.width;
+	}
+	if(height_percent) {
+		height = (height / 100.f) * rect.height;
+	}
+	update_surface_size();
+	free(geo_str);
+	return G_SOURCE_REMOVE;
+}
+
 void wofi_init(struct map* _config) {
 	config = _config;
 	char* width_str = config_get(config, "width", "1000");
@@ -1371,9 +1389,9 @@ void wofi_init(struct map* _config) {
 	gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
 	gtk_window_set_decorated(GTK_WINDOW(window), FALSE);
 
-	GdkDisplay* disp = gdk_display_get_default();
-	GdkWindow* gdk_win = gtk_widget_get_window(window);
 	if(!normal_window) {
+		GdkDisplay* disp = gdk_display_get_default();
+		GdkWindow* gdk_win = gtk_widget_get_window(window);
 		wl_list_init(&outputs);
 		wl = gdk_wayland_display_get_wl_display(disp);
 		struct wl_registry* registry = wl_display_get_registry(wl);
@@ -1425,22 +1443,6 @@ void wofi_init(struct map* _config) {
 		wl_display_roundtrip(wl);
 	}
 
-	bool width_percent = strchr(width_str, '%') != NULL;
-	bool height_percent = strchr(height_str, '%') != NULL;
-	if(width_percent || height_percent) {
-		GdkMonitor* monitor = gdk_display_get_monitor_at_window(disp, gdk_win);
-		GdkRectangle rect;
-		gdk_monitor_get_geometry(monitor, &rect);
-		if(width_percent) {
-			width = (width / 100.f) * rect.width;
-		}
-		if(height_percent) {
-			height = (height / 100.f) * rect.height;
-		}
-		update_surface_size();
-	}
-
-
 	outer_box = gtk_box_new(outer_orientation, 0);
 	gtk_widget_set_name(outer_box, "outer-box");
 	gtk_container_add(GTK_CONTAINER(window), outer_box);
@@ -1497,6 +1499,16 @@ void wofi_init(struct map* _config) {
 
 	gdk_threads_add_timeout(filter_rate, do_search, NULL);
 
+
+	bool width_percent = strchr(width_str, '%') != NULL;
+	bool height_percent = strchr(height_str, '%') != NULL;
+	if(width_percent || height_percent) {
+		char** geo_str = malloc(sizeof(char*) * 2);
+		geo_str[0] = width_str;
+		geo_str[1] = height_str;
+		gdk_threads_add_timeout(70, do_percent_size, geo_str);
+	}
+
 	pthread_t thread;
 	pthread_create(&thread, NULL, start_thread, mode);
 	gtk_window_set_title(GTK_WINDOW(window), prompt);