ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression in ea2a929f, check for Wayland 

Fix regression in ea2a929f, which broke x11 support by not checking for
Wayland when making the Wayland EGL subsurface move call.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2022-10-25 19:17:40 +00:00
parent 873de5f667
commit 0bfb88d0e3
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wx/panel.cpp
View File

@ -2364,6 +2364,7 @@ void GLDrawingPanel::OnSize(wxSizeEvent& ev)
AdjustViewport(); AdjustViewport();
// Temporary hack to backport 800d6ed69b from wxWidgets until 3.2.2 is released. // Temporary hack to backport 800d6ed69b from wxWidgets until 3.2.2 is released.
if (IsWayland())
MoveWaylandSubsurface(this); MoveWaylandSubsurface(this);
ev.Skip(); ev.Skip();

2
src/wx/wayland.cpp
View File

@ -17,6 +17,8 @@ bool IsWayland() { return GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default()); }
void MoveWaylandSubsurface(wxGLCanvas* win) void MoveWaylandSubsurface(wxGLCanvas* win)
{ {
if (!IsWayland()) return;
int x, y; int x, y;
gdk_window_get_origin(win->GTKGetDrawingWindow(), &x, &y); gdk_window_get_origin(win->GTKGetDrawingWindow(), &x, &y);
wl_subsurface_set_position(win->m_wlSubsurface, x, y); wl_subsurface_set_position(win->m_wlSubsurface, x, y);