Merge branch 'toplevel-move-resize' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Sun, 17 May 2020 19:15:46 +0000 (19:15 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 17 May 2020 19:15:46 +0000 (19:15 +0000)
Toplevel move resize

See merge request GNOME/gtk!1923

12 files changed:
1  2 
docs/reference/gdk/gdk4-sections.txt
docs/reference/gtk/migrating-3to4.xml
gdk/broadway/gdksurface-broadway.c
gdk/gdkinternals.h
gdk/gdksurface.c
gdk/gdksurface.h
gdk/gdksurfaceprivate.h
gdk/wayland/gdksurface-wayland.c
gdk/win32/gdksurface-win32.c
gdk/x11/gdksurface-x11.c
gtk/gtkwindow.c
gtk/gtkwindowhandle.c

index e5ad907320692d0228bd043efc427cd7f6ca23ca,824d7f76801b279e277a500d6d06f7f537d38d11..6f3e87246b6a768a59b2b43c9604db1e73732934
@@@ -183,10 -184,9 +183,8 @@@ gdk_surface_destro
  gdk_surface_is_destroyed
  gdk_surface_get_display
  gdk_surface_hide
 -gdk_surface_is_viewable
  gdk_surface_get_mapped
  gdk_surface_translate_coordinates
- gdk_surface_begin_resize_drag
- gdk_surface_begin_move_drag
  gdk_surface_beep
  gdk_surface_get_scale_factor
  gdk_surface_set_opaque_region
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gtk/gtkwindow.c
Simple merge
index 6ee052e9a4a47b3dbd8a7958b7df27f6f53e2275,ef1964e4336d2b22c1578a192b0e2d66e8d789c4..7fb0e85ea7d594fb36d1280c979d91edc37bc34e
@@@ -481,16 -483,13 +484,17 @@@ drag_gesture_update_cb (GtkGestureDra
                                          start_x, start_y,
                                          &window_x, &window_y);
  
 +      gtk_native_get_surface_transform (native, &native_x, &native_y);
 +      window_x += native_x;
 +      window_y += native_y;
 +
        surface = gtk_native_get_surface (native);
-       gdk_surface_begin_move_drag (surface,
-                                    gtk_gesture_get_device (GTK_GESTURE (gesture)),
-                                    gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)),
-                                    window_x, window_y,
-                                    gtk_event_controller_get_current_event_time (GTK_EVENT_CONTROLLER (gesture)));
+       if (GDK_IS_TOPLEVEL (surface))
+         gdk_toplevel_begin_move (GDK_TOPLEVEL (surface),
+                                  gtk_gesture_get_device (GTK_GESTURE (gesture)),
+                                  gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)),
+                                  window_x, window_y,
+                                  gtk_event_controller_get_current_event_time (GTK_EVENT_CONTROLLER (gesture)));
  
        gtk_event_controller_reset (GTK_EVENT_CONTROLLER (gesture));
        gtk_event_controller_reset (GTK_EVENT_CONTROLLER (self->click_gesture));