ubuntu-touch-coreapps-reviewers team mailing list archive

[Kunal Parmar <pkunal.parmar@xxxxxxxxx>]

Kunal Parmar has proposed merging lp:~pkunal-parmar/ubuntu-calendar-app/MakeEditorVisible into lp:ubuntu-calendar-app.

Commit message:
Resolves Bug #1311111
Making field visible on Focus

Requested reviews:
  Ubuntu Calendar Developers (ubuntu-calendar-dev)
Related bugs:
  Bug #1311111 in Ubuntu Calendar App: "entry fields can get obscured by OSK"
  https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1311111

For more details, see:
https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/MakeEditorVisible/+merge/253767

Resolves Bug #1311111
Making field visible on Focus
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~pkunal-parmar/ubuntu-calendar-app/MakeEditorVisible into lp:ubuntu-calendar-app.

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2015-03-12 14:44:42 +0000
+++ NewEvent.qml	2015-03-22 04:33:47 +0000
@@ -305,6 +305,7 @@
 
     Flickable{
         id: flickable
+        clip: true
 
         property var activeItem: null
 
@@ -317,14 +318,14 @@
             var position = flickable.contentItem.mapFromItem(item, 0, 0);
 
             // check if the item is already visible
-            var bottomY = flickable.contentY + flickable.height
-            var itemBottom = position.y + item.height
+            var bottomY =  flickable.contentY + flickable.height
+            var itemBottom = header.height + position.y + item.height
             if (position.y >= flickable.contentY && itemBottom <= bottomY) {
                 return;
             }
 
             // if it is not, try to scroll and make it visible
-            var targetY = position.y + item.height - flickable.height
+            var targetY = header.height + position.y + item.height - flickable.height
             if (targetY >= 0 && position.y) {
                 flickable.contentY = targetY;
             } else if (position.y < flickable.contentY) {
@@ -334,7 +335,10 @@
             flickable.returnToBounds()
         }
 
-        anchors.fill: parent
+        //anchors.fill: parent
+        y: header.height
+        width: parent.width;
+        height: parent.height;
         contentWidth: width
         contentHeight: column.height + units.gu(10)
 
@@ -405,6 +409,11 @@
                     }
 
                     placeholderText: i18n.tr("Event Name")
+                    onFocusChanged: {
+                        if(titleEdit.focus) {
+                            flickable.makeMeVisible(titleEdit);
+                        }
+                    }
                 }
 
                 TextArea{
@@ -418,6 +427,11 @@
                     }
 
                     placeholderText: i18n.tr("Description")
+                    onFocusChanged: {
+                        if(messageEdit.focus) {
+                            flickable.makeMeVisible(messageEdit);
+                        }
+                    }
                 }
 
                 TextField {
@@ -431,6 +445,12 @@
                     }
 
                     placeholderText: i18n.tr("Location")
+
+                    onFocusChanged: {
+                        if(locationEdit.focus) {
+                            flickable.makeMeVisible(locationEdit);
+                        }
+                    }
                 }
             }