Skip to content

Q
qtquickcontrols-nemo
Commit b6b56a00 authored by eekkelund's avatar eekkelund
Browse files
Options

[Keyboard] Add keyboard to clipped area

parent c2dfacb8
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 49 deletions
src/controls/qml/ApplicationWindow.qml
View file @ b6b56a00
...@@ -194,6 +194,37 @@ NemoWindow { ...@@ -194,6 +194,37 @@ NemoWindow {
anchors.fill: parent anchors.fill: parent
rotation: rotationToTransposeToPortrait() rotation: rotationToTransposeToPortrait()
Item {
id: clipping2
z: 1
property bool panelVisible: inputPanel.active
onPanelVisibleChanged:{
if(!panelVisible) {
imShowAnimation.stop()
imHideAnimation.start()
}else {
imHideAnimation.stop()
imShowAnimation.to = inputPanel.height
imShowAnimation.start()
}
}
width:(isUiLandscape ? stackView.panelSize : parent.width)
height:(isUiPortrait ? stackView.panelSize : root.height)
InputPanel {
z:99
id: inputPanel
visible: true
width:isUiPortrait ? backgroundItem.width : backgroundItem.height
x:0
rotation:contentArea.rotation
anchors.centerIn: parent
}
}
Item { Item {
id: clipping id: clipping
...@@ -206,14 +237,6 @@ NemoWindow { ...@@ -206,14 +237,6 @@ NemoWindow {
Item { Item {
id: contentArea id: contentArea
anchors.centerIn: parent anchors.centerIn: parent
InputPanel {
z:99
id: inputPanel
visible: Qt.inputMethod.visible
y: Qt.inputMethod.visible ? parent.height - inputPanel.height : parent.height
anchors.left: parent.left
anchors.right: parent.right
}
transform: Scale { transform: Scale {
id: contentScale id: contentScale
...@@ -244,10 +267,22 @@ NemoWindow { ...@@ -244,10 +267,22 @@ NemoWindow {
property real panelSize: 0 property real panelSize: 0
property real previousImSize: 0 property real previousImSize: 0
property real imSize: !root.applicationActive ? 0 : (isUiPortrait ? (root._transpose ? Qt.inputMethod.keyboardRectangle.width property real imSize: !root.applicationActive ? 0 : Qt.inputMethod.keyboardRectangle.height
: Qt.inputMethod.keyboardRectangle.height)
: (root._transpose ? Qt.inputMethod.keyboardRectangle.height onImSizeChanged: {
: Qt.inputMethod.keyboardRectangle.width)) if (imSize <= 0 && previousImSize > 0) {
imShowAnimation.stop()
imHideAnimation.start()
} else if (imSize > 0 && previousImSize <= 0) {
imHideAnimation.stop()
imShowAnimation.to = imSize
imShowAnimation.start()
} else {
panelSize = imSize
}
previousImSize = imSize
}
clip: true clip: true
Component.onCompleted: { Component.onCompleted: {
...@@ -297,6 +332,12 @@ NemoWindow { ...@@ -297,6 +332,12 @@ NemoWindow {
delegate: StackViewDelegate { delegate: StackViewDelegate {
pushTransition: Component { pushTransition: Component {
StackViewTransition { StackViewTransition {
ScriptAction {
script: {
imShowAnimation.stop()
imHideAnimation.start()
}
}
PropertyAnimation { PropertyAnimation {
target: enterItem target: enterItem
property: "x" property: "x"
...@@ -317,6 +358,12 @@ NemoWindow { ...@@ -317,6 +358,12 @@ NemoWindow {
} }
popTransition: Component { popTransition: Component {
StackViewTransition { StackViewTransition {
ScriptAction {
script: {
imShowAnimation.stop()
imHideAnimation.start()
}
}
PropertyAnimation { PropertyAnimation {
target: enterItem target: enterItem
property: "x" property: "x"
...@@ -368,7 +415,7 @@ NemoWindow { ...@@ -368,7 +415,7 @@ NemoWindow {
//used to animate the dimmer when pages are pushed/popped (see Header's QML code) //used to animate the dimmer when pages are pushed/popped (see Header's QML code)
property alias __dimmer: headerDimmerContainer property alias __dimmer: headerDimmerContainer
}
Item { Item {
//This item handles the rotation of the dimmer. //This item handles the rotation of the dimmer.
...@@ -398,6 +445,7 @@ NemoWindow { ...@@ -398,6 +445,7 @@ NemoWindow {
} }
} }
} }
}
Item { Item {
id: orientationState id: orientationState
...@@ -433,6 +481,13 @@ NemoWindow { ...@@ -433,6 +481,13 @@ NemoWindow {
anchors.right: undefined anchors.right: undefined
anchors.bottom: undefined anchors.bottom: undefined
} }
AnchorChanges {
target: clipping2
anchors.top: clipping.bottom
anchors.left: parent.left
anchors.right: undefined
anchors.bottom: undefined
}
}, },
State { State {
name: 'Landscape' name: 'Landscape'
...@@ -458,6 +513,13 @@ NemoWindow { ...@@ -458,6 +513,13 @@ NemoWindow {
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
} }
AnchorChanges {
target: clipping2
anchors.top: undefined
anchors.left: parent.left
anchors.right: undefined//clipping.left
anchors.bottom: parent.bottom
}
}, },
State { State {
name: 'PortraitInverted' name: 'PortraitInverted'
...@@ -483,6 +545,13 @@ NemoWindow { ...@@ -483,6 +545,13 @@ NemoWindow {
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
} }
AnchorChanges {
target: clipping2
anchors.top: undefined
anchors.left: undefined
anchors.right: clipping.right
anchors.bottom: clipping.top
}
}, },
State { State {
name: 'LandscapeInverted' name: 'LandscapeInverted'
...@@ -508,6 +577,13 @@ NemoWindow { ...@@ -508,6 +577,13 @@ NemoWindow {
anchors.right: undefined anchors.right: undefined
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
} }
AnchorChanges {
target: clipping2
anchors.top: undefined
anchors.left: undefined//clipping.right
anchors.right: parent.right
anchors.bottom: parent.bottom
}
} }
] ]
...@@ -520,12 +596,20 @@ NemoWindow { ...@@ -520,12 +596,20 @@ NemoWindow {
property: 'orientationTransitionRunning' property: 'orientationTransitionRunning'
value: true value: true
} }
ParallelAnimation {
NumberAnimation { NumberAnimation {
target: contentArea target: contentArea
property: 'opacity' property: 'opacity'
to: 0 to: 0
duration: 150 duration: 150
} }
NumberAnimation {
target: inputPanel
property: 'opacity'
to: 0
duration: 150
}
}
PropertyAction { PropertyAction {
target: contentArea target: contentArea
properties: 'width,height,rotation,uiOrientation' properties: 'width,height,rotation,uiOrientation'
...@@ -537,12 +621,20 @@ NemoWindow { ...@@ -537,12 +621,20 @@ NemoWindow {
target: headerDimmer target: headerDimmer
properties: 'width,height,rotation' properties: 'width,height,rotation'
} }
ParallelAnimation {
NumberAnimation { NumberAnimation {
target: contentArea target: contentArea
property: 'opacity' property: 'opacity'
to: 1 to: 1
duration: 150 duration: 150
} }
NumberAnimation {
target: inputPanel
property: 'opacity'
to: 1
duration: 150
}
}
PropertyAction { PropertyAction {
target: contentArea target: contentArea
property: 'orientationTransitionRunning' property: 'orientationTransitionRunning'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment