Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 23:49:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9484 from hyperlogic/tablet-ui

Browse source 
UI navigation work with game pads
This commit is contained in:
Seth Alves 2017-01-23 16:01:45 -08:00 committed by GitHub
commit 200105c856
4 changed files with 3 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
interface/resources/controllers/standard_navigation.json
View file

@ -1,6 +1,5 @@
{ {
"name": "Standard to Action", "name": "Standard to UI Navigation Action",
"when": "Application.NavigationFocused",
"channels": [ "channels": [
{ "from": "Standard.DU", "to": "Actions.UiNavVertical" }, { "from": "Standard.DU", "to": "Actions.UiNavVertical" },
{ "from": "Standard.DD", "to": "Actions.UiNavVertical", "filters": "invert" }, { "from": "Standard.DD", "to": "Actions.UiNavVertical", "filters": "invert" },
@ -9,42 +8,7 @@
{ "from": "Standard.LB", "to": "Actions.UiNavGroup","filters": "invert" }, { "from": "Standard.LB", "to": "Actions.UiNavGroup","filters": "invert" },
{ "from": "Standard.RB", "to": "Actions.UiNavGroup" }, { "from": "Standard.RB", "to": "Actions.UiNavGroup" },
{ "from": [ "Standard.A", "Standard.X" ], "to": "Actions.UiNavSelect" }, { "from": [ "Standard.A", "Standard.X" ], "to": "Actions.UiNavSelect" },
{ "from": [ "Standard.B", "Standard.Y" ], "to": "Actions.UiNavBack" }, { "from": [ "Standard.B", "Standard.Y" ], "to": "Actions.UiNavBack" }
{ "from": [ "Standard.RTClick", "Standard.LTClick" ], "to": "Actions.UiNavSelect" },
{
"from": "Standard.LX", "to": "Actions.UiNavLateral",
"filters": [
{ "type": "deadZone", "min": 0.95 },
"constrainToInteger",
{ "type": "pulse", "interval": 0.4 }
]
},
{
"from": "Standard.LY", "to": "Actions.UiNavVertical",
"filters": [
"invert",
{ "type": "deadZone", "min": 0.95 },
"constrainToInteger",
{ "type": "pulse", "interval": 0.4 }
]
},
{
"from": "Standard.RX", "to": "Actions.UiNavLateral",
"filters": [
{ "type": "deadZone", "min": 0.95 },
"constrainToInteger",
{ "type": "pulse", "interval": 0.4 }
]
},
{
"from": "Standard.RY", "to": "Actions.UiNavVertical",
"filters": [
"invert",
{ "type": "deadZone", "min": 0.95 },
"constrainToInteger",
{ "type": "pulse", "interval": 0.4 }
]
}
] ]
} }

2
interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
View file

@ -90,7 +90,6 @@ Item {
} else { } else {
breadcrumbText.text = "Menu"; breadcrumbText.text = "Menu";
topMenu = null; topMenu = null;
offscreenFlags.navigationFocused = false;
} }
} }
@ -99,7 +98,6 @@ Item {
topMenu = newMenu; topMenu = newMenu;
topMenu.focus = true; topMenu.focus = true;
topMenu.forceActiveFocus(); topMenu.forceActiveFocus();
offscreenFlags.navigationFocused = true;
} }
function clearMenus() { function clearMenus() {

3
interface/resources/qml/hifi/tablet/TabletRoot.qml
View file

@ -46,11 +46,8 @@ Item {
}); });
} }
loader.item.forceActiveFocus(); loader.item.forceActiveFocus();
offscreenFlags.navigationFocused = true;
} }
} }
Component.onDestruction: { offscreenFlags.navigationFocused = false; }
width: 480 width: 480
height: 720 height: 720

2
interface/src/Application.cpp
View file

@ -978,7 +978,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
using namespace controller; using namespace controller;
auto offscreenUi = DependencyManager::get<OffscreenUi>(); auto offscreenUi = DependencyManager::get<OffscreenUi>();
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>(); auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
if (offscreenUi->navigationFocused()) { {
auto actionEnum = static_cast<Action>(action); auto actionEnum = static_cast<Action>(action);
int key = Qt::Key_unknown; int key = Qt::Key_unknown;
static int lastKey = Qt::Key_unknown; static int lastKey = Qt::Key_unknown;