Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 06:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove duplicate keyboard

Browse source 
Fixes keyboard raising and lowering when select entity with editor open.
This commit is contained in:
David Rowe 2016-09-29 12:09:04 +13:00
parent 2933e37a0a
commit e9a398472a
1 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
interface/resources/qml/ToolWindow.qml
View file

@ -55,14 +55,11 @@ ScrollingWindow {
anchors.left: parent.left
anchors.top: parent.top
property bool keyboardRaised: false
property bool punctuationMode: false
TabView {
id: tabView;
width: pane.contentWidth
// Pane height so that don't use Window's scrollbars otherwise tabs may be scrolled out of view.
height: pane.scrollHeight - (toolWindowTabViewItem.keyboardRaised ? 200 : 0)
height: pane.scrollHeight
property int tabCount: 0
Repeater {
@ -147,37 +144,6 @@ ScrollingWindow {
tabOverlap: 0
}
}
// virtual keyboard, letters
Keyboard {
id: keyboard1
// y: parent.keyboardRaised ? parent.height : 0
height: parent.keyboardRaised ? 200 : 0
visible: parent.keyboardRaised && !parent.punctuationMode
enabled: parent.keyboardRaised && !parent.punctuationMode
anchors.right: parent.right
anchors.rightMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
anchors.bottom: parent.bottom
anchors.bottomMargin: 0
// anchors.bottomMargin: 2 * hifi.dimensions.contentSpacing.y
}
KeyboardPunctuation {
id: keyboard2
// y: parent.keyboardRaised ? parent.height : 0
height: parent.keyboardRaised ? 200 : 0
visible: parent.keyboardRaised && parent.punctuationMode
enabled: parent.keyboardRaised && parent.punctuationMode
anchors.right: parent.right
anchors.rightMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
anchors.bottom: parent.bottom
anchors.bottomMargin: 0
// anchors.bottomMargin: 2 * hifi.dimensions.contentSpacing.y
}
}
function updateVisiblity() {
@ -268,7 +234,6 @@ ScrollingWindow {
return;
}
if (properties.width) {
tabView.width = Math.min(Math.max(tabView.width, properties.width), toolWindow.maxSize.x);
}