games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-15 13:33:36 +02:00
Code Issues Releases Activity

Merge pull request #3201 from Alexander-Wilms/fix-huge-texture-crash

Browse Source 
Fix broken intro and crash when resizing window
This commit is contained in:
Ivan Savenko 2024-02-07 00:16:15 +02:00 committed by GitHub
commit c068c92c92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/eventsSDL/InputHandler.cpp
View File

@ -145,7 +145,7 @@ void InputHandler::preprocessEvent(const SDL_Event & ev)
Settings full = settings.write["video"]["fullscreen"];
full->Bool() = !full->Bool();
GH.onScreenResize();
GH.onScreenResize(false);
return;
}
}
@ -163,7 +163,7 @@ void InputHandler::preprocessEvent(const SDL_Event & ev)
#ifndef VCMI_IOS
{
boost::mutex::scoped_lock interfaceLock(GH.interfaceMutex);
GH.onScreenResize();
GH.onScreenResize(false);
}
#endif
break;

7
client/gui/CGuiHandler.cpp
View File

@ -251,8 +251,11 @@ void CGuiHandler::setStatusbar(std::shared_ptr<IStatusBar> newStatusBar)
currentStatusBar = newStatusBar;
}
void CGuiHandler::onScreenResize()
void CGuiHandler::onScreenResize(bool resolutionChanged)
{
screenHandler().onScreenResize();
if(resolutionChanged)
{
screenHandler().onScreenResize();
}
windows().onScreenResize();
}

4
client/gui/CGuiHandler.h
View File

@ -92,8 +92,8 @@ public:
void init();
void renderFrame();
/// called whenever user selects different resolution, requiring to center/resize all windows
void onScreenResize();
/// called whenever SDL_WINDOWEVENT_RESTORED is reported or the user selects a different resolution, requiring to center/resize all windows
void onScreenResize(bool resolutionChanged);
void handleEvents(); //takes events from queue and calls interested objects
void fakeMouseMove();

6
client/windows/settings/GeneralOptionsTab.cpp
View File

@ -317,7 +317,7 @@ void GeneralOptionsTab::setGameResolution(int index)
widget<CLabel>("resolutionLabel")->setText(resolutionToLabelString(resolution.x, resolution.y));
GH.dispatchMainThread([](){
GH.onScreenResize();
GH.onScreenResize(true);
});
}
@ -341,7 +341,7 @@ void GeneralOptionsTab::setFullscreenMode(bool on, bool exclusive)
updateResolutionSelector();
GH.dispatchMainThread([](){
GH.onScreenResize();
GH.onScreenResize(true);
});
}
@ -400,7 +400,7 @@ void GeneralOptionsTab::setGameScaling(int index)
widget<CLabel>("scalingLabel")->setText(scalingToLabelString(scaling));
GH.dispatchMainThread([](){
GH.onScreenResize();
GH.onScreenResize(true);
});
}