macos: toplevels have no parent
authorBenjamin Otte <otte@redhat.com>
Tue, 18 Apr 2023 14:15:59 +0000 (16:15 +0200)
committerBenjamin Otte <otte@redhat.com>
Wed, 26 Apr 2023 19:03:34 +0000 (21:03 +0200)
gdk/macos/gdkmacossurface.c
gdk/macos/gdkmacostoplevelsurface-private.h
gdk/macos/gdkmacostoplevelsurface.c

index 3f90a13bbf9ac68e506664f1dabc9edf8369ad3f..dc4375730c16896ff31f4a3e0989aae7564f9782 100644 (file)
@@ -633,7 +633,7 @@ _gdk_macos_surface_new (GdkMacosDisplay   *display,
   switch (surface_type)
     {
     case GDK_SURFACE_TOPLEVEL:
-      ret = _gdk_macos_toplevel_surface_new (display, parent, frame_clock, x, y, width, height);
+      ret = _gdk_macos_toplevel_surface_new (display, frame_clock, x, y, width, height);
       break;
 
     case GDK_SURFACE_POPUP:
index 2742cf06ca8079fe57606097db1dbbe53dbdab98..fe9b6acc0734b38fc7880471db18b5ba1a4aaa7e 100644 (file)
@@ -46,7 +46,6 @@ struct _GdkMacosToplevelSurfaceClass
 
 GType            _gdk_macos_toplevel_surface_get_type           (void);
 GdkMacosSurface *_gdk_macos_toplevel_surface_new                (GdkMacosDisplay *display,
-                                                                 GdkSurface      *parent,
                                                                  GdkFrameClock   *frame_clock,
                                                                  int              x,
                                                                  int              y,
index 0efa0a7791f1548dfdebc0896b4e9d38445d89e6..8fbbfd42cb783a94b68dd792dffcac89ed2288af 100644 (file)
@@ -650,7 +650,6 @@ _gdk_macos_toplevel_surface_init (GdkMacosToplevelSurface *self)
 
 GdkMacosSurface *
 _gdk_macos_toplevel_surface_new (GdkMacosDisplay *display,
-                                 GdkSurface      *parent,
                                  GdkFrameClock   *frame_clock,
                                  int              x,
                                  int              y,
@@ -670,19 +669,12 @@ _gdk_macos_toplevel_surface_new (GdkMacosDisplay *display,
 
   g_return_val_if_fail (GDK_IS_MACOS_DISPLAY (display), NULL);
   g_return_val_if_fail (!frame_clock || GDK_IS_FRAME_CLOCK (frame_clock), NULL);
-  g_return_val_if_fail (!parent || GDK_IS_MACOS_SURFACE (parent), NULL);
 
   style_mask = (NSWindowStyleMaskTitled |
                 NSWindowStyleMaskClosable |
                 NSWindowStyleMaskMiniaturizable |
                 NSWindowStyleMaskResizable);
 
-  if (parent != NULL)
-    {
-      x += GDK_MACOS_SURFACE (parent)->root_x;
-      y += GDK_MACOS_SURFACE (parent)->root_y;
-    }
-
   _gdk_macos_display_to_display_coords (display, x, y + height, &nx, &ny);
 
   screen = _gdk_macos_display_get_screen_at_display_coords (display, nx, ny);