pnx/spectre
1
0
Fork 0
Code Releases 2 Activity

Platform/PlatformWindow: pass owner in constructor instead of setting the variable directly on the object. it is cleaner.

Browse source
This commit is contained in:
Henrik Hautakoski 2023-08-22 17:18:39 +02:00
parent 5a7a5e3f7c
commit 1288ef88b8
6 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
source/Platform/PlatformWindow.cpp
View file

@ -16,12 +16,11 @@ namespace sp {
PlatformWindow* PlatformWindow::make(Window* owner) PlatformWindow* PlatformWindow::make(Window* owner)
{ {
WindowType* disp = new WindowType(); return new WindowType(owner);
disp->m_owner = owner;
return disp;
} }
PlatformWindow::PlatformWindow() PlatformWindow::PlatformWindow(Window* owner) :
m_owner (owner)
{ {
} }

2
source/Platform/PlatformWindow.h
View file

@ -60,7 +60,7 @@ public :
protected : protected :
PlatformWindow(); PlatformWindow(Window* owner);
void onReshape(int width, int height); void onReshape(int width, int height);

4
source/Platform/Unix/X11Window.cpp
View file

@ -28,8 +28,8 @@ X11Window* X11Window::getFocused()
return _priv::focused_window; return _priv::focused_window;
} }
X11Window:: X11Window::X11Window(Window *owner) :
X11Window() : PlatformWindow (owner),
m_screen (0), m_screen (0),
m_size (200,200), m_size (200,200),
m_cur_last (0), m_cur_last (0),

4
source/Platform/Unix/X11Window.h
View file

@ -11,13 +11,15 @@
namespace sp { namespace sp {
class Window;
class X11Window : public PlatformWindow class X11Window : public PlatformWindow
{ {
public : public :
static X11Window* getFocused(); static X11Window* getFocused();
X11Window(); X11Window(Window *owner);
virtual bool create(WindowDescription description); virtual bool create(WindowDescription description);

3
source/Platform/Win32/Win32Window.cpp
View file

@ -18,7 +18,8 @@ namespace sp {
static bool firstTime = true; static bool firstTime = true;
Win32Window::Win32Window() : Win32Window::Win32Window(Window* owner) :
PlatformWindow (owner),
m_handle (NULL), m_handle (NULL),
m_icon (0), m_icon (0),
m_cursor (0), m_cursor (0),

4
source/Platform/Win32/Win32Window.h
View file

@ -9,10 +9,12 @@
namespace sp { namespace sp {
class Window;
class Win32Window : public PlatformWindow class Win32Window : public PlatformWindow
{ {
public : public :
Win32Window(); Win32Window(Window* owner);
virtual ~Win32Window(); virtual ~Win32Window();
virtual bool create(WindowDescription description); virtual bool create(WindowDescription description);