Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.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
}

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

@ -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