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

Merge pull request #2829 from Laserlicht/level_up_easy

Browse Source
This commit is contained in:
Nordsoft91 2023-09-15 20:26:47 +02:00 committed by GitHub
commit 1f3f3ed603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/widgets/CComponent.cpp
View File

@ -269,6 +269,12 @@ void CSelectableComponent::clickPressed(const Point & cursorPosition)
onSelect();
}
void CSelectableComponent::clickDouble(const Point & cursorPosition)
{
if(onChoose)
onChoose();
}
void CSelectableComponent::init()
{
selected = false;
@ -278,7 +284,7 @@ CSelectableComponent::CSelectableComponent(const Component &c, std::function<voi
CComponent(c),onSelect(OnSelect)
{
setRedrawParent(true);
addUsedEvents(LCLICK | KEYBOARD);
addUsedEvents(LCLICK | DOUBLECLICK | KEYBOARD);
init();
}
@ -286,7 +292,7 @@ CSelectableComponent::CSelectableComponent(Etype Type, int Sub, int Val, ESize i
CComponent(Type,Sub,Val, imageSize),onSelect(OnSelect)
{
setRedrawParent(true);
addUsedEvents(LCLICK | KEYBOARD);
addUsedEvents(LCLICK | DOUBLECLICK | KEYBOARD);
init();
}

2
client/widgets/CComponent.h
View File

@ -77,11 +77,13 @@ class CSelectableComponent : public CComponent, public CKeyShortcut
public:
bool selected; //if true, this component is selected
std::function<void()> onSelect; //function called on selection change
std::function<void()> onChoose; //function called on doubleclick
void showAll(Canvas & to) override;
void select(bool on);
void clickPressed(const Point & cursorPosition) override; //call-in
void clickDouble(const Point & cursorPosition) override; //call-in
CSelectableComponent(Etype Type, int Sub, int Val, ESize imageSize=large, std::function<void()> OnSelect = nullptr);
CSelectableComponent(const Component & c, std::function<void()> OnSelect = nullptr);
};

1
client/windows/GUIClasses.cpp
View File

@ -415,6 +415,7 @@ CLevelWindow::CLevelWindow(const CGHeroInstance * hero, PrimarySkill pskill, std
for(auto & skill : skills)
{
auto comp = std::make_shared<CSelectableComponent>(CComponent::secskill, skill, hero->getSecSkillLevel(SecondarySkill(skill))+1, CComponent::medium);
comp->onChoose = std::bind(&CLevelWindow::close, this);
comps.push_back(comp);
}

7
client/windows/InfoWindows.cpp
View File

@ -106,6 +106,7 @@ CSelWindow::CSelWindow(const std::string &Text, PlayerColor player, int charperl
addChild(comps[i].get());
components.push_back(comps[i]);
comps[i]->onSelect = std::bind(&CSelWindow::selectionChange,this,i);
comps[i]->onChoose = std::bind(&CSelWindow::madeChoiceAndClose,this);
if(i<8)
comps[i]->assignedKey = vstd::next(EShortcut::SELECT_INDEX_1,i);
}
@ -127,6 +128,12 @@ void CSelWindow::madeChoice()
LOCPLINT->cb->selectionMade(ret+1,ID);
}
void CSelWindow::madeChoiceAndClose()
{
madeChoice();
close();
}
CInfoWindow::CInfoWindow(std::string Text, PlayerColor player, const TCompsInfo & comps, const TButtonsInfo & Buttons)
{
OBJECT_CONSTRUCTION_CAPTURING(255-DISPOSE);

1
client/windows/InfoWindows.h
View File

@ -130,6 +130,7 @@ class CSelWindow : public CInfoWindow
public:
void selectionChange(unsigned to);
void madeChoice(); //looks for selected component and calls callback
void madeChoiceAndClose();
CSelWindow(const std::string & text, PlayerColor player, int charperline, const std::vector<std::shared_ptr<CSelectableComponent>> & comps, const std::vector<std::pair<AnimationPath,CFunctionList<void()> > > &Buttons, QueryID askID);
//notification - this class inherits important destructor from CInfoWindow