git.iko.soy/unity8
on xenial help sign in
1.Optimize flickable' movement when virtual keyboard popups/disappear
25f2466Gary.Wzl
qml/Dash/Previews/Preview.qml+23−16
compare with xenial
unifiedsplit
@@ -61,16 +61,31 @@ Item {
61 property real columnWidth: width / columns
61 property real columnWidth: width / columns
62
62
63 Repeater {
63 Repeater {
64− id: repeater;
65 model: previewModel
64 model: previewModel
66−
65+
67 delegate: ListView {
66 delegate: ListView {
68 id: column
67 id: column
69 objectName: "previewListRow" + index
68 objectName: "previewListRow" + index
69+ anchors {
70+ top: parent.top
70− anchors { top: parent.top; bottom: parent.bottom }
71+ bottom: parent.bottom
72+ bottomMargin: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
73+ }
71 width: row.columnWidth
74 width: row.columnWidth
72 spacing: row.spacing
75 spacing: row.spacing
73− bottomMargin: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
76+ property var makeSureVisibleItem
77+ property real previousVisibleHeight: 0
78+ property real visibleHeight: height - bottomMargin
79+ onVisibleHeightChanged: {
80+ if (makeSureVisibleItem && makeSureVisibleItem.activeFocus && previousVisibleHeight > visibleHeight) {
81+ var textAreaPos = makeSureVisibleItem.mapToItem(column, 0, 0);
82+ if (textAreaPos.y + makeSureVisibleItem.height > column.visibleHeight) {
83+ column.contentY += textAreaPos.y + makeSureVisibleItem.height - column.visibleHeight
84+ }
85+ }
86+ previousVisibleHeight = visibleHeight;
87+ }
88+
74 model: columnModel
89 model: columnModel
75 cacheBuffer: height
90 cacheBuffer: height
76
91
@@ -82,8 +97,6 @@ Item {
82 widgetData: model.properties
97 widgetData: model.properties
83 isCurrentPreview: root.isCurrent
98 isCurrentPreview: root.isCurrent
84 scopeStyle: root.scopeStyle
99 scopeStyle: root.scopeStyle
85− readonly property int inputMethodMargin: units.gu(2);
86−
87 anchors {
100 anchors {
88 left: parent.left
101 left: parent.left
89 right: parent.right
102 right: parent.right
@@ -94,16 +107,10 @@ Item {
94 onTriggered: {
107 onTriggered: {
95 previewModel.triggered(widgetId, actionId, data);
108 previewModel.triggered(widgetId, actionId, data);
96 }
109 }
97−
98− onMakeSureVisible: {
110+ onMakeSureVisible: {
99− var textAreaPos = item.mapToItem(column, 0, 0);
111+ column.previousVisibleHeight=column.visibleHeight
100− var textAreaGlobalHeight = textAreaPos.y + item.implicitHeight
112+ column.makeSureVisibleItem=item
101− + column.height / 2.0;
102−
103− if (textAreaGlobalHeight > column.height) {
104− column.contentY += textAreaGlobalHeight - column.height + inputMethodMargin;
105− }
106− }
113+ }
107
114
108 onFocusChanged: if (focus) column.positionViewAtIndex(index, ListView.Contain)
115 onFocusChanged: if (focus) column.positionViewAtIndex(index, ListView.Contain)
109
116
qml/Dash/Previews/PreviewCommentInput.qml+1−1
@@ -39,7 +39,7 @@ PreviewWidget {
39 id: commentTextArea
39 id: commentTextArea
40 objectName: "commentTextArea"
40 objectName: "commentTextArea"
41
41
42− property bool inputMethodVisible: Qt.inputMethod.visible;
42+ property bool inputMethodVisible: Qt.inputMethod.visible
43 onInputMethodVisibleChanged: {
43 onInputMethodVisibleChanged: {
44 if(inputMethodVisible && activeFocus)
44 if(inputMethodVisible && activeFocus)
45 root.makeSureVisible(commentTextArea);
45 root.makeSureVisible(commentTextArea);
qml/Dash/Previews/PreviewRatingInput.qml+1−1
@@ -144,7 +144,7 @@ PreviewWidget {
144 id: reviewTextArea
144 id: reviewTextArea
145 objectName: "reviewTextArea"
145 objectName: "reviewTextArea"
146
146
147− property bool inputMethodVisible: Qt.inputMethod.visible;
147+ property bool inputMethodVisible: Qt.inputMethod.visible
148 onInputMethodVisibleChanged: {
148 onInputMethodVisibleChanged: {
149 if(inputMethodVisible && activeFocus)
149 if(inputMethodVisible && activeFocus)
150 root.makeSureVisible(reviewTextArea);
150 root.makeSureVisible(reviewTextArea);