From 22827f2cc7e2930c8f3ea86077ae20e93ce8d204 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 17 Jun 2021 09:40:22 -0400 Subject: [PATCH 1/2] macos: Fix a compiler warning --- gdk/macos/gdkmacosseat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdk/macos/gdkmacosseat.c b/gdk/macos/gdkmacosseat.c index b003bb7ca6..b555002dd4 100644 --- a/gdk/macos/gdkmacosseat.c +++ b/gdk/macos/gdkmacosseat.c @@ -348,7 +348,7 @@ _gdk_macos_seat_new (GdkMacosDisplay *display) init_devices (self); - return g_steal_pointer (&self); + return GDK_SEAT (g_steal_pointer (&self)); } static GdkDeviceToolType From d92f8a1b8ed78f8dfd9da0fa555d87a91e7d2e4b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 17 Jun 2021 15:54:36 -0700 Subject: [PATCH 2/2] treeviewcolumn: Clip header buttons We don't want to overdraw when dragging a narrow column around, and we also need the clipping to avoid picking the wrong column, when a later column button overlaps an earlier one. Fixes: #4045 --- gtk/gtktreeviewcolumn.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 4633cacc97..50d2eac884 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -855,6 +855,7 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column) priv->button = gtk_button_new (); g_object_ref_sink (priv->button); gtk_widget_set_focus_on_click (priv->button, FALSE); + gtk_widget_set_overflow (priv->button, GTK_OVERFLOW_HIDDEN); g_signal_connect (priv->button, "clicked", G_CALLBACK (gtk_tree_view_column_button_clicked),