Allow window resizing

Author: morganchristiansson

CGame.h

@@ -74,6 +74,7 @@ class CGame
 
     bool Init();
     bool ReCreateWindow();
+    void UpdateDisplaySize(unsigned width, unsigned height);
 
     void EventHandling(SDL_Event* Event);
 

CGame_Event.cpp

@@ -63,7 +63,11 @@ void CGame::EventHandling(SDL_Event* Event)
 
             switch(Event->key.keysym.sym)
             {
-                case SDLK_F2: fullscreen = !fullscreen; break;
+                case SDLK_RETURN:
+                case SDLK_KP_ENTER:
+                    if(Event->key.keysym.mod & KMOD_ALT)
+                        fullscreen = !fullscreen;
+                    break;
 
 #ifdef _ADMINMODE
                 case SDLK_F3: // if CTRL and ALT are pressed
@@ -377,6 +381,19 @@ void CGame::EventHandling(SDL_Event* Event)
             break;
         }
 
+        case SDL_WINDOWEVENT:
+        {
+            switch(Event->window.event)
+            {
+                case SDL_WINDOWEVENT_RESIZED:
+                {
+                    UpdateDisplaySize(Event->window.data1, Event->window.data2);
+                }
+                break;
+            }
+            break;
+        }
+
         case SDL_QUIT: Running = false; break;
 
         default: break;

CGame_Init.cpp

@@ -5,6 +5,8 @@
 
 #include "CGame.h"
 #include "CIO/CFile.h"
+#include "CIO/CMenu.h"
+#include "CIO/CWindow.h"
 #include "CMap.h"
 #include "CSurface.h"
 #include "SGE/sge_blib.h"
@@ -22,7 +24,7 @@ bool CGame::ReCreateWindow()
     window_.reset();
     window_.reset(SDL_CreateWindow("Return to the Roots Map editor [BETA]", SDL_WINDOWPOS_CENTERED,
                                    SDL_WINDOWPOS_CENTERED, GameResolution.x, GameResolution.y,
-                                   fullscreen ? SDL_WINDOW_FULLSCREEN : 0));
+                                   fullscreen ? SDL_WINDOW_FULLSCREEN : SDL_WINDOW_RESIZABLE));
     if(!window_)
         return false;
     renderer_.reset(SDL_CreateRenderer(window_.get(), -1, 0));
@@ -38,6 +40,19 @@ bool CGame::ReCreateWindow()
     return true;
 }
 
+void CGame::UpdateDisplaySize(unsigned width, unsigned height)
+{
+    GameResolution.x = width;
+    GameResolution.y = height;
+    displayTexture_.reset();
+    displayTexture_ = makeSdlTexture(renderer_, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, width, height);
+    Surf_Display = makeRGBSurface(width, height, true);
+    for(auto& menu : Menus)
+        menu->resetSurface();
+    for(auto& wnd : Windows)
+        wnd->resetSurface();
+}
+
 bool CGame::Init()
 {
     std::cout << "Return to the Roots Map editor\n";

CIO/CControlContainer.h

@@ -68,6 +68,11 @@ class CControlContainer
     }
     void setWaste() { waste = true; }
     bool isWaste() const { return waste; }
+    void resetSurface()
+    {
+        surface.reset();
+        needRender = true;
+    }
     // Methods
     CButton* addButton(void callback(int), int clickedParam, Uint16 x = 0, Uint16 y = 0, Uint16 w = 20, Uint16 h = 20,
                        int color = BUTTON_GREY, const char* text = nullptr, int picture = -1);

callbacks.cpp

@@ -611,7 +611,7 @@ void callback::EditorHelpMenu(int Param)
                                      "..............................F1");
             SelectBoxHelp->addOption(
               "Window/"
-              "Fullscreen........................................................................................F2");
+              "Fullscreen...................................................................................Alt+Enter");
             SelectBoxHelp->addOption(
               "Zoom in/normal/out......................................................................F5/F6/"
               "F7");