Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9412 from fayeli/menu-fix

Browse source 
Fixes for Tablet Menu Issues
This commit is contained in:
Seth Alves 2017-01-17 14:58:47 -08:00 committed by GitHub
commit c8382e6853
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/resources/qml/hifi/tablet/TabletMenu.qml
View file

@ -78,8 +78,11 @@ Item {
hoverEnabled: true hoverEnabled: true
onEntered: breadcrumbText.color = "#1fc6a6"; onEntered: breadcrumbText.color = "#1fc6a6";
onExited: breadcrumbText.color = "#ffffff"; onExited: breadcrumbText.color = "#ffffff";
// navigate back to parent level menu // navigate back to parent level menu if there is one
onClicked: menuPopperUpper.closeLastMenu(); onClicked:
if (breadcrumbText.text !== "Menu") {
menuPopperUpper.closeLastMenu();
}
} }
} }
} }

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

@ -149,6 +149,8 @@ Item {
// Don't block waiting for modal dialogs and such that the menu might open. // Don't block waiting for modal dialogs and such that the menu might open.
delay.trigger(item); delay.trigger(item);
clearMenus(); clearMenus();
// build root level menu
tabletMenu.buildMenu();
break; break;
} }
} }