From 55889adeff3fe5dd666709bdbc006e1905b4dd3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Thu, 29 Jul 2021 19:33:42 +0200 Subject: [PATCH] tools/debug-gui: refactor UI element placement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the code used to pace the different UI elements to its own function. Refactor, no functional changes. Signed-off-by: José Expósito --- tools/libinput-debug-gui.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/libinput-debug-gui.c b/tools/libinput-debug-gui.c index a14c178d..5bcf8a36 100644 --- a/tools/libinput-debug-gui.c +++ b/tools/libinput-debug-gui.c @@ -793,13 +793,8 @@ draw(GtkWidget *widget, cairo_t *cr, gpointer data) } static void -map_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) +window_place_ui_elements(GtkWidget *widget, struct window *w) { - struct window *w = data; - GdkDisplay *display; - GdkSeat *seat; - GdkWindow *window; - gtk_window_get_size(GTK_WINDOW(widget), &w->width, &w->height); w->pointer.x = w->width/2; @@ -824,6 +819,17 @@ map_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) w->pinch.scale = 1.0; w->pinch.x = w->width/2; w->pinch.y = w->height/2; +} + +static void +map_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + struct window *w = data; + GdkDisplay *display; + GdkSeat *seat; + GdkWindow *window; + + window_place_ui_elements(widget, w); g_signal_connect(G_OBJECT(w->area), "draw", G_CALLBACK(draw), w);