games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Implementation of (very basic) shortcuts system

Browse Source 
- Added EShortcut enumeration that contains all in-game shortcuts
- CIntObject::keyPressed now receive values from hotkey enumeration
- On keypress, SDL key code will be translated to shortcut ID
- Removed access to SDL key codes from most of engine
This commit is contained in:
Ivan Savenko
2023-04-27 20:21:06 +03:00
parent ac09f78c67
commit 832e56e005
57 changed files with 920 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/widgets/Buttons.cpp
View File

@@ -19,6 +19,7 @@
#include "../battle/BattleInterface.h"
#include "../battle/BattleInterfaceClasses.h"
#include "../gui/CGuiHandler.h"
#include "../gui/Shortcut.h"
#include "../windows/InfoWindows.h"
#include "../render/CAnimation.h"
#include "../renderSDL/SDL_Extensions.h"
@@ -223,7 +224,7 @@ void CButton::hover (bool on)
}
}
CButton::CButton(Point position, const std::string &defName, const std::pair<std::string, std::string> &help, CFunctionList<void()> Callback, int key, bool playerColoredButton):
CButton::CButton(Point position, const std::string &defName, const std::pair<std::string, std::string> &help, CFunctionList<void()> Callback, EShortcut key, bool playerColoredButton):
CKeyShortcut(key),
callback(Callback)
{
@@ -345,7 +346,7 @@ void CToggleBase::addCallback(std::function<void(bool)> function)
}
CToggleButton::CToggleButton(Point position, const std::string &defName, const std::pair<std::string, std::string> &help,
CFunctionList<void(bool)> callback, int key, bool playerColoredButton):
CFunctionList<void(bool)> callback, EShortcut key, bool playerColoredButton):
CButton(position, defName, help, 0, key, playerColoredButton),
CToggleBase(callback)
{
@@ -800,37 +801,37 @@ void CSlider::wheelScrolled(bool down, bool in)
moveTo(value + 3 * (positive ? +scrollStep : -scrollStep));
}
void CSlider::keyPressed(const SDL_Keycode & key)
void CSlider::keyPressed(EShortcut key)
{
int moveDest = value;
switch(key)
{
case SDLK_UP:
case EShortcut::SELECT_UP:
if (!horizontal)
moveDest = value - scrollStep;
break;
case SDLK_LEFT:
case EShortcut::SELECT_LEFT:
if (horizontal)
moveDest = value - scrollStep;
break;
case SDLK_DOWN:
case EShortcut::SELECT_DOWN:
if (!horizontal)
moveDest = value + scrollStep;
break;
case SDLK_RIGHT:
case EShortcut::SELECT_RIGHT:
if (horizontal)
moveDest = value + scrollStep;
break;
case SDLK_PAGEUP:
case EShortcut::SELECT_PAGE_UP:
moveDest = value - capacity + scrollStep;
break;
case SDLK_PAGEDOWN:
case EShortcut::SELECT_PAGE_DOWN:
moveDest = value + capacity - scrollStep;
break;
case SDLK_HOME:
case EShortcut::SELECT_FIRST:
moveDest = 0;
break;
case SDLK_END:
case EShortcut::SELECT_LAST:
moveDest = amount - capacity;
break;
default: