From 98221936448cdcf757576acbb257049eca826331 Mon Sep 17 00:00:00 2001
From: Vladyslav Stelmakhovskyi <vladyslav.stelmakhovski@volvocars.com>
Date: Wed, 29 Mar 2017 14:41:18 +0200
Subject: [PATCH 1/3] Set z-order of comboboxes to make sure lowest will no
overlap higher ones
---
.../tablet/tabletWindows/preferences/Section.qml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
index 3d6dfa10ce..9dd0956000 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
@@ -89,14 +89,17 @@ Preference {
if (categoryPreferences) {
console.log("Category " + root.name + " with " + categoryPreferences.length + " preferences");
for (var j = 0; j < categoryPreferences.length; ++j) {
- buildPreference(categoryPreferences[j]);
+ //provide component position within column
+ //lowest numbers on top
+ buildPreference(categoryPreferences[j], j);
}
}
}
- function buildPreference(preference) {
+ function buildPreference(preference, itemNum) {
console.log("\tPreference type " + preference.type + " name " + preference.name)
var builder;
+ var zpos;
switch (preference.type) {
case Preference.Editable:
checkBoxCount = 0;
@@ -136,11 +139,14 @@ Preference {
case Preference.ComboBox:
checkBoxCount = 0;
builder = comboBoxBuilder;
+ //make sure that combo boxes sitting higher will have higher z coordinate
+ //to be not overlapped when drop down is active
+ zpos = root.z + 1000 - itemNum
break;
};
if (builder) {
- preferences.push(builder.createObject(contentContainer, { preference: preference, isFirstCheckBox: (checkBoxCount === 1) }));
+ preferences.push(builder.createObject(contentContainer, { preference: preference, isFirstCheckBox: (checkBoxCount === 1) , z: zpos}));
}
}
}
From 7558765042014f03aa014d8d69d9e7a690b54d8e Mon Sep 17 00:00:00 2001
From: Vladyslav Stelmakhovskyi <vladyslav.stelmakhovski@volvocars.com>
Date: Fri, 31 Mar 2017 14:20:15 +0200
Subject: [PATCH 2/3] Script log now back to HUD
---
interface/src/Application.cpp | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 25a585ea34..83c14457fb 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5781,22 +5781,10 @@ void Application::toggleRunningScriptsWidget() const {
}
void Application::showScriptLogs() {
- auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
- auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
auto scriptEngines = DependencyManager::get<ScriptEngines>();
QUrl defaultScriptsLoc = defaultScriptsLocation();
defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/debugging/debugWindow.js");
-
- if (tablet->getToolbarMode()) {
- scriptEngines->loadScript(defaultScriptsLoc.toString());
- } else {
- QQuickItem* tabletRoot = tablet->getTabletRoot();
- if (!tabletRoot && !isHMDMode()) {
- scriptEngines->loadScript(defaultScriptsLoc.toString());
- } else {
- tablet->pushOntoStack("../../hifi/dialogs/TabletDebugWindow.qml");
- }
- }
+ scriptEngines->loadScript(defaultScriptsLoc.toString());
}
void Application::showAssetServerWidget(QString filePath) {
From d207dae5b7bdf8b295e20a37da3cbc49d5606f26 Mon Sep 17 00:00:00 2001
From: Vladyslav Stelmakhovskyi <vladyslav.stelmakhovski@volvocars.com>
Date: Sun, 2 Apr 2017 20:02:40 +0200
Subject: [PATCH 3/3] Put current address to location instead of inputfield
---
.../qml/hifi/tablet/TabletAddressDialog.qml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
index 623054f233..0373253ff3 100644
--- a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
@@ -38,7 +38,7 @@ StackView {
root.currentItem.focus = true;
root.currentItem.forceActiveFocus();
fillDestinations();
- updateLocationText();
+ updateLocationText(false);
root.parentChanged.connect(center);
center();
}
@@ -62,8 +62,8 @@ StackView {
root.push(card);
return;
}
- addressLine.text = targetString;
- toggleOrGo(true);
+ location.text = targetString;
+ toggleOrGo(true, targetString);
clearAddressLineTimer.start();
}
@@ -539,7 +539,11 @@ StackView {
}
}
- function toggleOrGo(fromSuggestions) {
+ function toggleOrGo(fromSuggestions, address) {
+ if (address !== undefined && address !== "") {
+ addressBarDialog.loadAddress(address, fromSuggestions)
+ }
+
if (addressLine.text !== "") {
addressBarDialog.loadAddress(addressLine.text, fromSuggestions)
}