[gtk/wip/chergert/quartz4u: 739/782] macos: simplify root coords calculation
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/chergert/quartz4u: 739/782] macos: simplify root coords calculation
- Date: Thu, 11 Jun 2020 19:00:53 +0000 (UTC)
commit 4afe1b53578a36f83cd491a410f95e04d4ec8466
Author: Christian Hergert <chergert redhat com>
Date: Tue May 19 17:00:05 2020 -0700
macos: simplify root coords calculation
We already store the window position in root coords, so no need to
waste effort on translations.
gdk/macos/gdkmacossurface.c | 29 ++---------------------------
1 file changed, 2 insertions(+), 27 deletions(-)
---
diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c
index cad4275800..f47c55c962 100644
--- a/gdk/macos/gdkmacossurface.c
+++ b/gdk/macos/gdkmacossurface.c
@@ -193,39 +193,14 @@ gdk_macos_surface_get_root_coords (GdkSurface *surface,
int *root_y)
{
GdkMacosSurface *self = (GdkMacosSurface *)surface;
- GdkDisplay *display;
- NSRect content_rect;
- int tmp_x = 0;
- int tmp_y = 0;
g_assert (GDK_IS_MACOS_SURFACE (self));
- if (GDK_SURFACE_DESTROYED (surface))
- {
- if (root_x)
- *root_x = 0;
- if (root_y)
- *root_y = 0;
-
- return;
- }
-
- content_rect = [self->window contentRectForFrameRect:[self->window frame]];
-
- display = gdk_surface_get_display (surface);
- _gdk_macos_display_from_display_coords (GDK_MACOS_DISPLAY (display),
- content_rect.origin.x,
- content_rect.origin.y + content_rect.size.height,
- &tmp_x, &tmp_y);
-
- tmp_x += x;
- tmp_y += y;
-
if (root_x)
- *root_x = tmp_x;
+ *root_x = surface->x + x;
if (root_y)
- *root_y = tmp_y;
+ *root_y = surface->y + y;
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]