Revert "Allow window resizing"

This reverts commit e441969.

Author: morganchristiansson

CGame.h

@@ -74,7 +74,6 @@ class CGame
 
     bool Init();
     bool ReCreateWindow();
-    void UpdateDisplaySize(const Extent& newSize);
 
     void EventHandling(SDL_Event* Event);
 

CGame_Event.cpp

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

CGame_Init.cpp

@@ -5,8 +5,6 @@
 
 #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"
@@ -24,7 +22,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 : SDL_WINDOW_RESIZABLE));
+                                   fullscreen ? SDL_WINDOW_FULLSCREEN : 0));
     if(!window_)
         return false;
     renderer_.reset(SDL_CreateRenderer(window_.get(), -1, 0));
@@ -40,19 +38,6 @@ bool CGame::ReCreateWindow()
     return true;
 }
 
-void CGame::UpdateDisplaySize(const Extent& newSize)
-{
-    GameResolution = newSize;
-    displayTexture_.reset();
-    displayTexture_ =
-      makeSdlTexture(renderer_, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, newSize.x, newSize.y);
-    Surf_Display = makeRGBSurface(newSize.x, newSize.y, 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,11 +68,6 @@ 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...................................................................................Alt+Enter");
+              "Fullscreen........................................................................................F2");
             SelectBoxHelp->addOption(
               "Zoom in/normal/out......................................................................F5/F6/"
               "F7");