games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #624 from Toneyisnow/toneyisnow/Fixbug_LobbyScreen_LoadGame

Browse Source 
Fix bug: LobbyScreen UI has a bug on the Difficulty toggle group.
This commit is contained in:
Alexander Shishkin
2020-01-23 16:13:51 +03:00
committed by GitHub
parent ac81d0f7b4 8341ba3c27
commit 304b6e2fb2
3 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/lobby/CLobbyScreen.cpp
View File

@@ -187,9 +187,19 @@ void CLobbyScreen::updateAfterStateChange()
tabOpt->recreate(); tabOpt->recreate();
card->changeSelection(); card->changeSelection();
if(card->iconDifficulty) if (card->iconDifficulty)
card->iconDifficulty->setSelected(CSH->si->difficulty); {
if (screenType == ESelectionScreen::loadGame)
{
// When loading the game, only one button in the difficulty toggle group should be enabled, so here disable all other buttons first, then make selection
card->iconDifficulty->setSelectedOnly(CSH->si->difficulty);
}
else
{
card->iconDifficulty->setSelected(CSH->si->difficulty);
}
}
if(curTab == tabRand && CSH->si->mapGenOptions) if(curTab == tabRand && CSH->si->mapGenOptions)
tabRand->setMapGenOptions(CSH->si->mapGenOptions); tabRand->setMapGenOptions(CSH->si->mapGenOptions);
} }

21
client/widgets/Buttons.cpp
View File

@@ -322,6 +322,11 @@ void CToggleBase::doSelect(bool on)
// for overrides // for overrides
} }
void CToggleBase::setEnabled(bool enabled)
{
// for overrides
}
void CToggleBase::setSelected(bool on) void CToggleBase::setSelected(bool on)
{ {
bool changed = (on != selected); bool changed = (on != selected);
@@ -363,6 +368,11 @@ void CToggleButton::doSelect(bool on)
} }
} }
void CToggleButton::setEnabled(bool enabled)
{
setState(enabled ? NORMAL : BLOCKED);
}
void CToggleButton::clickLeft(tribool down, bool previousState) void CToggleButton::clickLeft(tribool down, bool previousState)
{ {
// force refresh // force refresh
@@ -425,6 +435,17 @@ void CToggleGroup::setSelected(int id)
selectionChanged(id); selectionChanged(id);
} }
void CToggleGroup::setSelectedOnly(int id)
{
for(auto it = buttons.begin(); it != buttons.end(); it++)
{
int buttonId = it->first;
buttons[buttonId]->setEnabled(buttonId == id);
}
selectionChanged(id);
}
void CToggleGroup::selectionChanged(int to) void CToggleGroup::selectionChanged(int to)
{ {
if (to == selectedID) if (to == selectedID)

8
client/widgets/Buttons.h
View File

@@ -139,12 +139,17 @@ public:
void setSelected(bool on); void setSelected(bool on);
void addCallback(std::function<void(bool)> callback); void addCallback(std::function<void(bool)> callback);
/// Set whether the toggle is currently enabled for user to use, this is only inplemented in ToggleButton, not for other toggles yet.
virtual void setEnabled(bool enabled);
}; };
/// A button which can be selected/deselected, checkbox /// A button which can be selected/deselected, checkbox
class CToggleButton : public CButton, public CToggleBase class CToggleButton : public CButton, public CToggleBase
{ {
void doSelect(bool on) override; void doSelect(bool on) override;
void setEnabled(bool enabled) override;
public: public:
CToggleButton(Point position, const std::string &defName, const std::pair<std::string, std::string> &help, CToggleButton(Point position, const std::string &defName, const std::pair<std::string, std::string> &help,
CFunctionList<void(bool)> Callback = 0, int key=0, bool playerColoredButton = false ); CFunctionList<void(bool)> Callback = 0, int key=0, bool playerColoredButton = false );
@@ -173,6 +178,9 @@ public:
void addToggle(int index, std::shared_ptr<CToggleBase> button); void addToggle(int index, std::shared_ptr<CToggleBase> button);
/// Changes selection to specific value. Will select toggle with this ID, if present /// Changes selection to specific value. Will select toggle with this ID, if present
void setSelected(int id); void setSelected(int id);
/// in some cases, e.g. LoadGame difficulty selection, after refreshing the UI, the ToggleGroup should
/// reset all of it's child buttons to BLOCK state, then make selection again
void setSelectedOnly(int id);
}; };
/// A typical slider for volume with an animated indicator /// A typical slider for volume with an animated indicator