From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 13 Feb 2023 23:38:27 +0000 (-0500)
Subject: gtk-demo: Fix hotspot handling in dnd
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~6^2~86^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e6dfb8732afda62ff34fbbf5619c8c9e61edb7fa;p=gtk4.git

gtk-demo: Fix hotspot handling in dnd

We were not remembering the pointer coordinates.
---

diff --git a/demos/gtk-demo/dnd.c b/demos/gtk-demo/dnd.c
index beba858832..ef281aeab2 100644
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -356,6 +356,10 @@ canvas_item_start_editing (CanvasItem *item)
 
 }
 
+typedef struct {
+  double x, y;
+} Hotspot;
+
 static GdkContentProvider *
 prepare (GtkDragSource *source,
          double         x,
@@ -363,6 +367,7 @@ prepare (GtkDragSource *source,
 {
   GtkWidget *canvas;
   GtkWidget *item;
+  Hotspot *hotspot;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);
@@ -373,6 +378,10 @@ prepare (GtkDragSource *source,
 
   g_object_set_data (G_OBJECT (canvas), "dragged-item", item);
 
+  hotspot = g_new (Hotspot, 1);
+  gtk_widget_translate_coordinates (canvas, item, x, y, &hotspot->x, &hotspot->y);
+  g_object_set_data_full (G_OBJECT (canvas), "hotspot", hotspot, g_free);
+
   return gdk_content_provider_new_typed (GTK_TYPE_WIDGET, item);
 }
 
@@ -383,12 +392,14 @@ drag_begin (GtkDragSource *source,
   GtkWidget *canvas;
   CanvasItem *item;
   GdkPaintable *paintable;
+  Hotspot *hotspot;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = CANVAS_ITEM (g_object_get_data (G_OBJECT (canvas), "dragged-item"));
+  hotspot = (Hotspot *) g_object_get_data (G_OBJECT (canvas), "hotspot");
 
   paintable = canvas_item_get_drag_icon (item);
-  gtk_drag_source_set_icon (source, paintable, item->r, item->r);
+  gtk_drag_source_set_icon (source, paintable, hotspot->x, hotspot->y);
   g_object_unref (paintable);
 
   gtk_widget_set_opacity (GTK_WIDGET (item), 0.3);