AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 14:10:30 +00:00
Code Issues Projects Releases Wiki Activity

wayland/surface: Compute size on layout

Browse Source 
Stop using the 'compute-size' phase of the frame clock, use the layout
phase instead, now that GTK isn't using the layout phase anymore.
This commit is contained in:
Jonas Ådahl 2020-11-24 23:16:48 +01:00
parent ecc861bf06
commit 13931463bd
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/gdksurface.c
View File

@ -1375,6 +1375,7 @@ gdk_surface_layout_on_clock (GdkFrameClock *clock,
void *data) void *data)
{ {
GdkSurface *surface = GDK_SURFACE (data); GdkSurface *surface = GDK_SURFACE (data);
GdkSurfaceClass *class;
g_return_if_fail (GDK_IS_SURFACE (surface)); g_return_if_fail (GDK_IS_SURFACE (surface));
@ -1387,6 +1388,10 @@ gdk_surface_layout_on_clock (GdkFrameClock *clock,
if (surface->update_freeze_count) if (surface->update_freeze_count)
return; return;
class = GDK_SURFACE_GET_CLASS (surface);
if (class->compute_size)
class->compute_size (surface);
g_signal_emit (surface, signals[LAYOUT], 0, surface->width, surface->height); g_signal_emit (surface, signals[LAYOUT], 0, surface->width, surface->height);
} }

1
gdk/gdksurfaceprivate.h
View File

@ -170,6 +170,7 @@ struct _GdkSurfaceClass
gboolean attached, gboolean attached,
GdkGLContext *share, GdkGLContext *share,
GError **error); GError **error);
void (* compute_size) (GdkSurface *surface);
}; };
#define GDK_SURFACE_DESTROYED(d) (((GdkSurface *)(d))->destroyed) #define GDK_SURFACE_DESTROYED(d) (((GdkSurface *)(d))->destroyed)

10
gdk/wayland/gdksurface-wayland.c
View File

@ -603,8 +603,7 @@ on_frame_clock_before_paint (GdkFrameClock *clock,
} }
static void static void
on_frame_clock_compute_size (GdkFrameClock *clock, gdk_wayland_surface_compute_size (GdkSurface *surface)
GdkSurface *surface)
{ {
GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
@ -794,7 +793,6 @@ _gdk_wayland_display_create_surface (GdkDisplay *display,
gdk_wayland_surface_create_surface (surface); gdk_wayland_surface_create_surface (surface);
g_signal_connect (frame_clock, "before-paint", G_CALLBACK (on_frame_clock_before_paint), surface); g_signal_connect (frame_clock, "before-paint", G_CALLBACK (on_frame_clock_before_paint), surface);
g_signal_connect (frame_clock, "compute-size", G_CALLBACK (on_frame_clock_compute_size), surface);
g_signal_connect (frame_clock, "after-paint", G_CALLBACK (on_frame_clock_after_paint), surface); g_signal_connect (frame_clock, "after-paint", G_CALLBACK (on_frame_clock_after_paint), surface);
g_object_unref (frame_clock); g_object_unref (frame_clock);
@ -1448,7 +1446,7 @@ gdk_wayland_surface_configure_toplevel (GdkSurface *surface)
} }
impl->surface_geometry_dirty = TRUE; impl->surface_geometry_dirty = TRUE;
gdk_surface_request_compute_size (surface); gdk_surface_request_layout (surface);
GDK_DISPLAY_NOTE (gdk_surface_get_display (surface), EVENTS, GDK_DISPLAY_NOTE (gdk_surface_get_display (surface), EVENTS,
g_message ("configure, surface %p %dx%d,%s%s%s%s", g_message ("configure, surface %p %dx%d,%s%s%s%s",
@ -3314,7 +3312,6 @@ gdk_wayland_surface_destroy (GdkSurface *surface,
frame_clock = gdk_surface_get_frame_clock (surface); frame_clock = gdk_surface_get_frame_clock (surface);
g_signal_handlers_disconnect_by_func (frame_clock, on_frame_clock_before_paint, surface); g_signal_handlers_disconnect_by_func (frame_clock, on_frame_clock_before_paint, surface);
g_signal_handlers_disconnect_by_func (frame_clock, on_frame_clock_compute_size, surface);
g_signal_handlers_disconnect_by_func (frame_clock, on_frame_clock_after_paint, surface); g_signal_handlers_disconnect_by_func (frame_clock, on_frame_clock_after_paint, surface);
display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface)); display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
@ -4110,6 +4107,7 @@ gdk_wayland_surface_class_init (GdkWaylandSurfaceClass *klass)
impl_class->set_opaque_region = gdk_wayland_surface_set_opaque_region; impl_class->set_opaque_region = gdk_wayland_surface_set_opaque_region;
impl_class->set_shadow_width = gdk_wayland_surface_set_shadow_width; impl_class->set_shadow_width = gdk_wayland_surface_set_shadow_width;
impl_class->create_gl_context = gdk_wayland_surface_create_gl_context; impl_class->create_gl_context = gdk_wayland_surface_create_gl_context;
impl_class->compute_size = gdk_wayland_surface_compute_size;
} }
void void
@ -4893,7 +4891,7 @@ gdk_wayland_toplevel_present (GdkToplevel *toplevel,
if (!pending_configure) if (!pending_configure)
{ {
impl->surface_geometry_dirty = TRUE; impl->surface_geometry_dirty = TRUE;
gdk_surface_request_compute_size (surface); gdk_surface_request_layout (surface);
} }
} }