[#17] : Fixed issue with window resizing

ange-yaghi · Jul 12, 2020 · 87ac1b0 · 87ac1b0
1 parent cdfa374
commit 87ac1b0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/engines/basic/src/delta_engine.cpp b/engines/basic/src/delta_engine.cpp
@@ -165,7 +165,7 @@ ysError dbasic::DeltaEngine::CreateGameWindow(const GameEngineSettings &settings
 
     m_initialized = true;
 
-    SetWindowSize(m_gameWindow->GetScreenWidth(), m_gameWindow->GetScreenHeight());
+    m_windowHandler.OnResizeWindow(m_gameWindow->GetWidth(), m_gameWindow->GetHeight());
 
     return YDS_ERROR_RETURN(ysError::YDS_NO_ERROR);
 }

diff --git a/engines/basic/src/window_handler.cpp b/engines/basic/src/window_handler.cpp
@@ -13,9 +13,9 @@ dbasic::WindowHandler::~WindowHandler() {
 }
 
 void dbasic::WindowHandler::OnResizeWindow(int width, int height) {
-    //m_engine->SetWindowSize(width, height);
-    //m_device->UpdateRenderingContext(m_context);
-    //m_engine->GetConsole()->ResetScreenPosition();
+    m_engine->SetWindowSize(width, height);
+    m_device->UpdateRenderingContext(m_context);
+    m_engine->GetConsole()->ResetScreenPosition();
 }
 
 void dbasic::WindowHandler::Initialize(ysDevice *device, ysRenderingContext *context, DeltaEngine *engine) {

diff --git a/src/yds_opengl_device.cpp b/src/yds_opengl_device.cpp
@@ -291,7 +291,7 @@ ysError ysOpenGLDevice::SetRenderTarget(ysRenderTarget *target) {
 ysError ysOpenGLDevice::DestroyRenderTarget(ysRenderTarget *&target) {
     YDS_ERROR_DECLARE("DestroyRenderTarget");
 
-    if (target == NULL) return YDS_ERROR_RETURN(ysError::YDS_INVALID_PARAMETER);
+    if (target == nullptr) return YDS_ERROR_RETURN(ysError::YDS_INVALID_PARAMETER);
 
     if (target == m_activeRenderTarget) {
         YDS_NESTED_ERROR_CALL(SetRenderTarget(NULL));

diff --git a/src/yds_window.cpp b/src/yds_window.cpp
@@ -151,20 +151,20 @@ void ysWindow::OnMoveWindow(int x, int y) {
     m_locationx = x + m_frameOriginXOffset;
     m_locationy = y + m_frameOriginYOffset;
 
-    if (m_eventHandler) m_eventHandler->OnMoveWindow(x, y);
+    if (m_eventHandler != nullptr) m_eventHandler->OnMoveWindow(x, y);
 }
 
 void ysWindow::OnResizeWindow(int w, int h) {
     m_width = w + m_frameWidthOffset;
     m_height = h + m_frameHeightOffset;
 
-    if (m_eventHandler) m_eventHandler->OnResizeWindow(w, h);
+    if (m_eventHandler != nullptr) m_eventHandler->OnResizeWindow(w, h);
 }
 
 void ysWindow::OnActivate() {
     m_active = true;
 
-    if (m_eventHandler) m_eventHandler->OnActivate();
+    if (m_eventHandler != nullptr) m_eventHandler->OnActivate();
 }
 
 void ysWindow::OnDeactivate() {

diff --git a/src/yds_windows_window.cpp b/src/yds_windows_window.cpp
@@ -61,18 +61,21 @@ ysError ysWindowsWindow::InitializeWindow(ysWindow *parent, const char *title, W
         m_instance,
         NULL);
 
-    m_width = width;
-    m_height = height;
-
-    m_locationx = x;
-    m_locationy = y;
-
     m_frameOriginXOffset = rc.left;
     m_frameOriginYOffset = rc.top;
 
     m_frameWidthOffset = rc.right - rc.left - width;
     m_frameHeightOffset = rc.bottom - rc.top - height;
 
+    RECT rect;
+    GetClientRect(m_hwnd, &rect);
+
+    m_width = rect.right - rect.left + m_frameWidthOffset;
+    m_height = rect.bottom - rect.top + m_frameHeightOffset;
+
+    m_locationx = x;
+    m_locationy = y;
+
     SetWindowPos(m_hwnd, NULL, m_locationx, m_locationy, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
 
     return YDS_ERROR_RETURN(ysError::YDS_NO_ERROR);

diff --git a/src/yds_windows_window_system.cpp b/src/yds_windows_window_system.cpp
@@ -90,7 +90,7 @@ LRESULT WINAPI ysWindowsWindowSystem::WinProc(HWND hWnd, UINT msg, WPARAM wParam
     PAINTSTRUCT ps;
     HDC hdc;
 
-    if (target) {
+    if (target != nullptr) {
         switch (msg) {
         case WM_DESTROY:
             PostQuitMessage(0);