From 30714d5d254cdb924ad35302a81355dd296a2e58 Mon Sep 17 00:00:00 2001 From: Vladyslav Stelmakhovskyi Date: Thu, 22 Jun 2017 16:47:40 +0200 Subject: [PATCH] Make background with default color. Fix few warnings --- interface/resources/qml/controls-uit/ComboBox.qml | 2 +- .../qml/hifi/tablet/tabletWindows/TabletFileDialog.qml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/controls-uit/ComboBox.qml b/interface/resources/qml/controls-uit/ComboBox.qml index 3ce297ef80..d672fa6387 100644 --- a/interface/resources/qml/controls-uit/ComboBox.qml +++ b/interface/resources/qml/controls-uit/ComboBox.qml @@ -217,7 +217,7 @@ FocusScope { anchors.leftMargin: hifi.dimensions.textPadding anchors.verticalCenter: parent.verticalCenter id: popupText - text: listView.model[index] ? listView.model[index] : (listView.model.get(index).text ? listView.model.get(index).text : "") + text: listView.model[index] ? listView.model[index] : (listView.model.get && listView.model.get(index).text ? listView.model.get(index).text : "") size: hifi.fontSizes.textFieldInput color: hifi.colors.baseGray } diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml index 26e35c4dcf..7b91cfeba9 100644 --- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml +++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml @@ -23,11 +23,13 @@ import "../../../windows" import "../../../dialogs/fileDialog" //FIXME implement shortcuts for favorite location -Item { +Rectangle { id: root - anchors.top: parent.top + anchors.top: parent ? parent.top : undefined HifiConstants { id: hifi } + color: hifi.colors.baseGray; + Settings { category: "FileDialog" property alias width: root.width