ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid semi-transparent window

Browse Source
This commit is contained in:
Deve 2017-05-15 21:17:03 +02:00
parent 961ac4d79e
commit f99bc25845
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
View File

@ -639,9 +639,7 @@ bool CIrrDeviceWayland::isWaylandDeviceWorking()
CIrrDeviceWayland::CIrrDeviceWayland(const SIrrlichtCreationParameters& param) CIrrDeviceWayland::CIrrDeviceWayland(const SIrrlichtCreationParameters& param)
: CIrrDeviceStub(param), : CIrrDeviceStub(param),
Width(param.WindowSize.Width), Height(param.WindowSize.Height), Width(param.WindowSize.Width), Height(param.WindowSize.Height),
WindowHasFocus(false), WindowMinimized(false), WindowHasFocus(false), WindowMinimized(false)
UseXVidMode(false), UseXRandR(false), UseGLXWindow(false),
ExternalWindow(false), AutorepeatSupport(0)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("CIrrDeviceLinux"); setDebugName("CIrrDeviceLinux");
@ -769,6 +767,17 @@ void CIrrDeviceWayland::initEGL()
EglContext->init(egl_params); EglContext->init(egl_params);
video::useCoreContext = !EglContext->isLegacyDevice(); video::useCoreContext = !EglContext->isLegacyDevice();
int w = 0;
int h = 0;
if (EglContext->getSurfaceDimensions(&w, &h))
{
Width = w;
Height = h;
CreationParams.WindowSize.Width = Width;
CreationParams.WindowSize.Height = Height;
}
} }
bool CIrrDeviceWayland::createWindow() bool CIrrDeviceWayland::createWindow()
@ -789,14 +798,18 @@ bool CIrrDeviceWayland::createWindow()
{ {
wl_shell_surface_set_toplevel(shell_surface); wl_shell_surface_set_toplevel(shell_surface);
} }
wl_display_flush(display); wl_display_flush(display);
initEGL(); initEGL();
CreationParams.WindowSize.Width = Width; wl_region* region = wl_compositor_create_region(compositor);
CreationParams.WindowSize.Height = Height; wl_region_add(region, 0, 0, Width, Height);
wl_surface_set_opaque_region(surface, region);
wl_region_destroy(region);
wl_display_flush(display);
return true; return true;
} }

7
lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.h
View File

@ -301,17 +301,10 @@ namespace irr
void updateCursor(); void updateCursor();
private: private:
// XVisualInfo* visual;
mutable core::stringc Clipboard; mutable core::stringc Clipboard;
u32 Width, Height; u32 Width, Height;
bool WindowHasFocus; bool WindowHasFocus;
bool WindowMinimized; bool WindowMinimized;
bool UseXVidMode;
bool UseXRandR;
bool UseGLXWindow;
bool ExternalWindow;
int AutorepeatSupport;
public: public:
struct SKeyMap struct SKeyMap
{ {