games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

allow double click for bonus selection

Browse Source
This commit is contained in:
Laserlicht
2024-09-06 00:08:18 +02:00
parent 6179521364
commit 7ae8514657
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/lobby/CBonusSelection.cpp
View File

@@ -350,7 +350,10 @@ void CBonusSelection::createBonusesIcons()
break;
}
std::shared_ptr<CToggleButton> bonusButton = std::make_shared<CToggleButton>(Point(475 + i * 68, 455), AnimationPath::builtin("campaignBonusSelection"), CButton::tooltip(desc.toString(), desc.toString()));
std::shared_ptr<CToggleButton> bonusButton = std::make_shared<CToggleButton>(Point(475 + i * 68, 455), AnimationPath::builtin("campaignBonusSelection"), CButton::tooltip(desc.toString(), desc.toString()), nullptr, EShortcut::NONE, false, [this](){
if(buttonStart->isActive() && !buttonStart->isBlocked())
CBonusSelection::startMap();
});
if(picNumber != -1)
bonusButton->setOverlay(std::make_shared<CAnimImage>(AnimationPath::builtin(picName), picNumber));

13
client/widgets/Buttons.cpp
View File

@@ -446,10 +446,13 @@ void CToggleBase::setAllowDeselection(bool on)
}
CToggleButton::CToggleButton(Point position, const AnimationPath &defName, const std::pair<std::string, std::string> &help,
CFunctionList<void(bool)> callback, EShortcut key, bool playerColoredButton):
CFunctionList<void(bool)> callback, EShortcut key, bool playerColoredButton,
CFunctionList<void()> callbackSelected):
CButton(position, defName, help, 0, key, playerColoredButton),
CToggleBase(callback)
CToggleBase(callback),
callbackSelected(callbackSelected)
{
addUsedEvents(DOUBLECLICK);
}
void CToggleButton::doSelect(bool on)
@@ -516,6 +519,12 @@ void CToggleButton::clickCancel(const Point & cursorPosition)
doSelect(isSelected());
}
void CToggleButton::clickDouble(const Point & cursorPosition)
{
if(callbackSelected)
callbackSelected();
}
void CToggleGroup::addCallback(const std::function<void(int)> & callback)
{
onChange += callback;

6
client/widgets/Buttons.h
View File

@@ -166,13 +166,17 @@ class CToggleButton : public CButton, public CToggleBase
void doSelect(bool on) override;
void setEnabled(bool enabled) override;
CFunctionList<void()> callbackSelected;
public:
CToggleButton(Point position, const AnimationPath &defName, const std::pair<std::string, std::string> &help,
CFunctionList<void(bool)> Callback = 0, EShortcut key = {}, bool playerColoredButton = false );
CFunctionList<void(bool)> Callback = nullptr, EShortcut key = {}, bool playerColoredButton = false,
CFunctionList<void()> CallbackSelected = nullptr );
void clickPressed(const Point & cursorPosition) override;
void clickReleased(const Point & cursorPosition) override;
void clickCancel(const Point & cursorPosition) override;
void clickDouble(const Point & cursorPosition) override;
// bring overrides into scope
//using CButton::addCallback;