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

Merge pull request #13599 from danteruiz/fix-combobox

Browse source 
fixing combo boxes
This commit is contained in:
John Conklin II 2018-07-13 10:33:33 -07:00 committed by GitHub
commit 33fb759c0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,6 @@ FocusScope {
hoverEnabled: true hoverEnabled: true
visible: true visible: true
height: hifi.fontSizes.textFieldInput + 13 // Match height of TextField control. height: hifi.fontSizes.textFieldInput + 13 // Match height of TextField control.
textRole: "text"
function previousItem() { root.currentHighLightedIndex = (root.currentHighLightedIndex + comboBox.count - 1) % comboBox.count; } function previousItem() { root.currentHighLightedIndex = (root.currentHighLightedIndex + comboBox.count - 1) % comboBox.count; }
function nextItem() { root.currentHighLightedIndex = (root.currentHighLightedIndex + comboBox.count + 1) % comboBox.count; } function nextItem() { root.currentHighLightedIndex = (root.currentHighLightedIndex + comboBox.count + 1) % comboBox.count; }

1
interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
View file

@ -125,7 +125,6 @@ Rectangle {
id: wearablesCombobox id: wearablesCombobox
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
comboBox.textRole: "text"
model: ListModel { model: ListModel {
function findIndexById(id) { function findIndexById(id) {