libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-08 10:51:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGS: Apply upstream rename of vis constants

Browse Source 
This applies commit b31631d749e8a8ce7dd06d47e87e0193d8fb8871
This commit is contained in:
Paul Gilbert 2021-04-17 16:12:18 -07:00
parent bc8c92c2f9
commit 0f362ab975
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/ags/shared/gui/guimain.cpp
View File

@ -806,8 +806,8 @@ void WriteGUI(const std::vector<GUIMain> &theGuis, Stream *out) {
void ApplyLegacyVisibility(GUIMain &gui, LegacyGUIVisState vis) {
// kGUIPopupMouseY had its own rules, which we practically reverted now
if (gui.PopupStyle == kGUIPopupMouseY) {
// it was only !Visible if the legacy Visibility was Concealed
gui.SetVisible(vis != kGUIVisibility_Concealed);
// it was only !Visible if the legacy Visibility was LockedOff
gui.SetVisible(vis != kGUIVisibility_LockedOff);
// and you could tell it's overridden by behavior when legacy Visibility is Off
gui.SetConceal(vis == kGUIVisibility_Off);
}

6
engines/ags/shared/gui/guimain.h
View File

@ -58,9 +58,9 @@ namespace Shared {
// Legacy GUIMain visibility state, which combined Visible property and override factor
enum LegacyGUIVisState {
kGUIVisibility_Concealed = -1, // gui is hidden by command
kGUIVisibility_Off = 0, // gui is disabled (won't show up by command)
kGUIVisibility_On = 1 // gui is shown by command
kGUIVisibility_LockedOff = -1, // locked hidden (used by PopupMouseY guis)
kGUIVisibility_Off = 0, // hidden
kGUIVisibility_On = 1 // shown
};
class Bitmap;