solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Refactor the code to use wxEGLUpdatePosition()

Browse source 
No real changes, just add a helper function and call it instead of using
m_wlSubsurface directly.

This has the advantage of reusing the same code as in CreateSurface()
and also avoids making m_wlSubsurface public unnecessarily, as was done
in the parent commit.
This commit is contained in:
Vadim Zeitlin 2022-09-24 23:26:23 +02:00
parent 800d6ed69b
commit d1f18ecca6
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/wx/unix/glegl.h
View file

@ -122,7 +122,6 @@ public:
wl_subcompositor *m_wlSubcompositor;
wl_callback *m_wlFrameCallbackHandler;
wl_egl_window *m_wlEGLWindow;
wl_subsurface *m_wlSubsurface;
private:
@ -133,9 +132,12 @@ private:
unsigned long m_xwindow;
wl_surface *m_wlSurface;
wl_region *m_wlRegion;
wl_subsurface *m_wlSubsurface;
// the global/default versions of the above
static EGLConfig *ms_glEGLConfig;
friend void wxEGLUpdatePosition(wxGLCanvasEGL* win);
};
// ----------------------------------------------------------------------------

18
src/unix/glegl.cpp
View file

@ -395,6 +395,15 @@ EGLDisplay wxGLCanvasEGL::GetDisplay()
}
#ifdef GDK_WINDOWING_WAYLAND
// Helper declared as friend in the header and so can access m_wlSubsurface.
void wxEGLUpdatePosition(wxGLCanvasEGL* win)
{
int x, y;
gdk_window_get_origin(win->GTKGetDrawingWindow(), &x, &y);
wl_subsurface_set_position(win->m_wlSubsurface, x, y);
}
extern "C"
{
@ -445,9 +454,8 @@ static void gtk_glcanvas_size_callback(GtkWidget *widget,
int scale = gtk_widget_get_scale_factor(widget);
wl_egl_window_resize(win->m_wlEGLWindow, win->m_width * scale,
win->m_height * scale, 0, 0);
int x, y;
gdk_window_get_origin(win->GTKGetDrawingWindow(), &x, &y);
wl_subsurface_set_position(win->m_wlSubsurface, x, y);
wxEGLUpdatePosition(win);
}
} // extern "C"
@ -475,8 +483,6 @@ bool wxGLCanvasEGL::CreateSurface()
#ifdef GDK_WINDOWING_WAYLAND
if (wxGTKImpl::IsWayland(window))
{
int x, y;
gdk_window_get_origin(window, &x, &y);
int w = gdk_window_get_width(window);
int h = gdk_window_get_height(window);
struct wl_display *display = gdk_wayland_display_get_wl_display(gdk_window_get_display(window));
@ -496,7 +502,7 @@ bool wxGLCanvasEGL::CreateSurface()
surface);
wl_surface_set_input_region(m_wlSurface, m_wlRegion);
wl_subsurface_set_desync(m_wlSubsurface);
wl_subsurface_set_position(m_wlSubsurface, x, y);
wxEGLUpdatePosition(this);
int scale = gdk_window_get_scale_factor(window);
wl_surface_set_buffer_scale(m_wlSurface, scale);
m_wlEGLWindow = wl_egl_window_create(m_wlSurface, w * scale,