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

Merge pull request #10131 from druiz17/tablet-edit-box

Browse source 
Fix the text input for edit's newModelDialog
This commit is contained in:
Seth Alves 2017-04-05 12:37:26 -07:00 committed by GitHub
commit b0ccbae552
1 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
interface/resources/qml/hifi/tablet/NewModelDialog.qml
View file

@ -22,15 +22,20 @@ Rectangle {
color: hifi.colors.baseGray; color: hifi.colors.baseGray;
property var eventBridge; property var eventBridge;
signal sendToScript(var message); signal sendToScript(var message);
property bool keyboardEnabled: false
property bool punctuationMode: false
property bool keyboardRasied: false
Column { Item {
id: column1 id: column1
anchors.rightMargin: 10 anchors.rightMargin: 10
anchors.leftMargin: 10 anchors.leftMargin: 10
anchors.bottomMargin: 10 anchors.bottomMargin: 10
anchors.topMargin: 10 anchors.topMargin: 10
anchors.fill: parent anchors.top: parent.top
spacing: 5 anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: keyboard.top
Text { Text {
id: text1 id: text1
@ -43,17 +48,42 @@ Rectangle {
id: modelURL id: modelURL
height: 20 height: 20
text: qsTr("") text: qsTr("")
color: "white"
anchors.top: text1.bottom
anchors.topMargin: 5
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0 anchors.leftMargin: 0
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 0 anchors.rightMargin: 0
font.pixelSize: 12 font.pixelSize: 12
onAccepted: {
newModelDialog.keyboardEnabled = false;
}
MouseArea {
anchors.fill: parent
onClicked: {
newModelDialog.keyboardEnabled = HMD.active
parent.focus = true;
parent.forceActiveFocus()
}
}
}
Rectangle {
id: textInputBox
color: "white"
anchors.fill: modelURL
opacity: 0.1
} }
Row { Row {
id: row1 id: row1
height: 400 height: 400
spacing: 30 spacing: 30
anchors.top: modelURL.top
anchors.topMargin: 25
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0 anchors.leftMargin: 0
anchors.right: parent.right anchors.right: parent.right
@ -155,4 +185,15 @@ Rectangle {
} }
} }
} }
Keyboard {
id: keyboard
raised: parent.keyboardEnabled
numeric: parent.punctuationMode
anchors {
bottom: parent.bottom
left: parent.left
right: parent.right
}
}
} }