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

Merge pull request #10782 from vladest/fix_browse_black

Browse source 
Make background with default color. Fix few warnings
This commit is contained in:
Brad Hefta-Gaub 2017-06-26 09:50:09 -07:00 committed by GitHub
commit 6314a8d273
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/controls-uit/ComboBox.qml
View file

@ -217,7 +217,7 @@ FocusScope {
anchors.leftMargin: hifi.dimensions.textPadding anchors.leftMargin: hifi.dimensions.textPadding
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
id: popupText 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 size: hifi.fontSizes.textFieldInput
color: hifi.colors.baseGray color: hifi.colors.baseGray
} }

6
interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
View file

@ -23,11 +23,13 @@ import "../../../windows"
import "../../../dialogs/fileDialog" import "../../../dialogs/fileDialog"
//FIXME implement shortcuts for favorite location //FIXME implement shortcuts for favorite location
Item { Rectangle {
id: root id: root
anchors.top: parent.top anchors.top: parent ? parent.top : undefined
HifiConstants { id: hifi } HifiConstants { id: hifi }
color: hifi.colors.baseGray;
Settings { Settings {
category: "FileDialog" category: "FileDialog"
property alias width: root.width property alias width: root.width