games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Fix bug: LobbyScreen UI has a bug on the Difficulty toggle group.

Browse Source 
Scenario: In LoadGame Lobby screen, the difficulty toggle group is showing multiple choices, but actually only one valid is working.

The reason is, in the Lobby screen Initialization code will set the difficulty = 0, and each time the player changes a map in the selection, the toggle group control is not resetting the difficulty buttons to disabled state.

How fix:
Add a new method to ToggleGroup class: setSelectedOnly, which will disable all other buttons and then set the selected button.

Note:
During the game loading time, the client is loading the map, and send a NetPack to server: LobbySetMap, and send a NetPack to Interface: LobbyUpdateState.
In the LobbyUpdateState it sets the map difficulty.
This commit is contained in:
toneyisnow 2020-01-21 01:09:08 -08:00
parent 905d31b8d7
commit 01ca21ae67
3 changed files with 44 additions and 3 deletions
Show Stats 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();
card->changeSelection();
if(card->iconDifficulty)
card->iconDifficulty->setSelected(CSH->si->difficulty);
if (card->iconDifficulty)
{
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)
tabRand->setMapGenOptions(CSH->si->mapGenOptions);
}

23
client/widgets/Buttons.cpp
View File

@ -23,6 +23,8 @@
#include "../windows/InfoWindows.h"
#include "../../lib/CConfigHandler.h"
using namespace std;
void CButton::update()
{
if (overlay)
@ -322,6 +324,11 @@ void CToggleBase::doSelect(bool on)
// for overrides
}
void CToggleBase::setEnabled(bool enabled)
{
// for overrides
}
void CToggleBase::setSelected(bool on)
{
bool changed = (on != selected);
@ -363,6 +370,11 @@ void CToggleButton::doSelect(bool on)
}
}
void CToggleButton::setEnabled(bool enabled)
{
setState(enabled ? NORMAL : BLOCKED);
}
void CToggleButton::clickLeft(tribool down, bool previousState)
{
// force refresh
@ -425,6 +437,17 @@ void CToggleGroup::setSelected(int id)
selectionChanged(id);
}
void CToggleGroup::setSelectedOnly(int id)
{
for (map<int, shared_ptr<CToggleBase> >::iterator it = buttons.begin(); it != buttons.end(); it++)
{
int buttonId = it->first;
buttons[buttonId]->setEnabled(buttonId == id);
}
selectionChanged(id);
}
void CToggleGroup::selectionChanged(int to)
{
if (to == selectedID)

8
client/widgets/Buttons.h
View File

@ -139,12 +139,17 @@ public:
void setSelected(bool on);
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
class CToggleButton : public CButton, public CToggleBase
{
void doSelect(bool on) override;
void setEnabled(bool enabled) override;
public:
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 );
@ -173,6 +178,9 @@ public:
void addToggle(int index, std::shared_ptr<CToggleBase> button);
/// Changes selection to specific value. Will select toggle with this ID, if present
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