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

make it also usable on android

Browse Source
This commit is contained in:
Laserlicht 2024-08-28 23:07:00 +02:00
parent 8ae4a4ab8a
commit aa6cbdf13b
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/windows/settings/AdventureOptionsTab.cpp
View File

@ -11,6 +11,7 @@
#include "AdventureOptionsTab.h" #include "AdventureOptionsTab.h"
#include "../../eventsSDL/InputHandler.h"
#include "../../../lib/filesystem/ResourcePath.h" #include "../../../lib/filesystem/ResourcePath.h"
#include "../../gui/CGuiHandler.h" #include "../../gui/CGuiHandler.h"
#include "../../widgets/Buttons.h" #include "../../widgets/Buttons.h"
@ -36,6 +37,9 @@ AdventureOptionsTab::AdventureOptionsTab()
OBJECT_CONSTRUCTION; OBJECT_CONSTRUCTION;
setRedrawParent(true); setRedrawParent(true);
addConditional("touchscreen", GH.input().getCurrentInputMode() == InputMode::TOUCH);
addConditional("keyboardMouse", GH.input().getCurrentInputMode() == InputMode::KEYBOARD_AND_MOUSE);
addConditional("controller", GH.input().getCurrentInputMode() == InputMode::CONTROLLER);
#ifdef VCMI_MOBILE #ifdef VCMI_MOBILE
addConditional("mobile", true); addConditional("mobile", true);
addConditional("desktop", false); addConditional("desktop", false);

4
client/windows/settings/GeneralOptionsTab.cpp
View File

@ -97,7 +97,9 @@ GeneralOptionsTab::GeneralOptionsTab()
OBJECT_CONSTRUCTION; OBJECT_CONSTRUCTION;
setRedrawParent(true); setRedrawParent(true);
addConditional("touchscreen", GH.input().hasTouchInputDevice()); addConditional("touchscreen", GH.input().getCurrentInputMode() == InputMode::TOUCH);
addConditional("keyboardMouse", GH.input().getCurrentInputMode() == InputMode::KEYBOARD_AND_MOUSE);
addConditional("controller", GH.input().getCurrentInputMode() == InputMode::CONTROLLER);
#ifdef VCMI_MOBILE #ifdef VCMI_MOBILE
addConditional("mobile", true); addConditional("mobile", true);
addConditional("desktop", false); addConditional("desktop", false);

5
client/windows/settings/SettingsMainWindow.cpp
View File

@ -196,3 +196,8 @@ void SettingsMainWindow::onScreenResize()
if (tab) if (tab)
tab->updateResolutionSelector(); tab->updateResolutionSelector();
} }
void SettingsMainWindow::inputModeChanged(InputMode mode)
{
tabContentArea->reset();
}

1
client/windows/settings/SettingsMainWindow.h
View File

@ -42,5 +42,6 @@ public:
void showAll(Canvas & to) override; void showAll(Canvas & to) override;
void onScreenResize() override; void onScreenResize() override;
void inputModeChanged(InputMode mode) override;
}; };

8
config/widgets/settings/adventureOptionsTab.json
View File

@ -364,7 +364,7 @@
}, },
{ {
"text": "vcmi.adventureOptions.leftButtonDrag.hover", "text": "vcmi.adventureOptions.leftButtonDrag.hover",
"created" : "desktop" "created" : "keyboardMouse"
}, },
{ {
"text": "vcmi.adventureOptions.smoothDragging.hover" "text": "vcmi.adventureOptions.smoothDragging.hover"
@ -379,7 +379,7 @@
[ [
{ {
"text": "vcmi.adventureOptions.rightButtonDrag.hover", "text": "vcmi.adventureOptions.rightButtonDrag.hover",
"created" : "desktop" "created" : "keyboardMouse"
} }
] ]
}, },
@ -423,7 +423,7 @@
"name": "leftButtonDragCheckbox", "name": "leftButtonDragCheckbox",
"help": "vcmi.adventureOptions.leftButtonDrag", "help": "vcmi.adventureOptions.leftButtonDrag",
"callback": "leftButtonDragChanged", "callback": "leftButtonDragChanged",
"created" : "desktop" "created" : "keyboardMouse"
}, },
{ {
"name": "smoothDraggingCheckbox", "name": "smoothDraggingCheckbox",
@ -442,7 +442,7 @@
"name": "rightButtonDragCheckbox", "name": "rightButtonDragCheckbox",
"help": "vcmi.adventureOptions.rightButtonDrag", "help": "vcmi.adventureOptions.rightButtonDrag",
"callback": "rightButtonDragChanged", "callback": "rightButtonDragChanged",
"created" : "desktop" "created" : "keyboardMouse"
} }
] ]
} }