Merge branch 'master' of https://github.com/codenameone/CodenameOne

codenameone · Mar 7, 2018 · fffd7b4 · fffd7b4
2 parents 1ad1a3c + 0d49314
commit fffd7b4
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 20 deletions.
diff --git a/CodenameOne/src/com/codename1/ui/AutoCompleteTextField.java b/CodenameOne/src/com/codename1/ui/AutoCompleteTextField.java
@@ -187,7 +187,7 @@ protected void updateFilterList() {
             popup.setVisible(v);
             popup.setEnabled(v);
             f.repaint();
-        } 
+        }
         if(f != null) {
             dontCalcSize = false;
             f.revalidate();
@@ -217,23 +217,18 @@ private boolean filterImpl(String text) {
                 popup.getComponentAt(0).setScrollY(0);
                 popup.setVisible(v);
                 popup.setEnabled(v);
-                Form f = getComponentForm();
-                if(f != null) {
-                    if(popup.getHeight() < f.getContentPane().getHeight()/2){
-                        int popupHeight = calcPopuupHeight((List)popup.getComponentAt(0));
-                        popup.setHeight(popupHeight);
-                        dontCalcSize = false;                        
-                        popup.forceRevalidate();
-                        dontCalcSize = true;
-                        f.repaint();
-                    }                  
-                }
+            }
+            Form f = getComponentForm();
 
-                if(!v) {
-                    if(f != null) {
-                        f.repaint();
-                    }
-                }
+            if (popup.getComponentCount() > 0) {
+                int popupHeight = calcPopuupHeight((List)popup.getComponentAt(0));
+                popup.setHeight(popupHeight);
+                dontCalcSize = false;                        
+                popup.forceRevalidate();
+                dontCalcSize = true;
+            }
+            if (f != null) {
+                f.repaint();
             }
         }
         return res;

diff --git a/CodenameOne/src/com/codename1/ui/SwipeableContainer.java b/CodenameOne/src/com/codename1/ui/SwipeableContainer.java
@@ -409,6 +409,7 @@ public void actionPerformed(ActionEvent evt) {
                             if (topX > 0) {
                                 if (topX > bottomLeftW / 2) {
                                     open = false;
+                                    openedToRight = false;
                                     openToRight();
                                 } else {
                                     open = true;
@@ -417,6 +418,7 @@ public void actionPerformed(ActionEvent evt) {
                             } else {
                                 if (topX + topWrapper.getWidth() < bottomRightX + bottomRightW / 2) {
                                     open = false;
+                                    openedToLeft = false;
                                     openToLeft();
                                 } else {
                                     open = true;

diff --git a/Ports/Android/src/com/codename1/impl/android/InPlaceEditView.java b/Ports/Android/src/com/codename1/impl/android/InPlaceEditView.java
@@ -63,6 +63,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.FrameLayout;
+import com.codename1.ui.Accessor;
 
 import com.codename1.ui.Component;
 import com.codename1.ui.Container;
@@ -1506,7 +1507,20 @@ public static void edit(final AndroidImplementation impl, final Component compon
             if (mIsEditing) {
 
                 if (impl.isAsyncEditMode()) {
-                    isEditedFieldSwitch = true;
+                    // Using isEditedFieldSwitch was causing issues with cursors not showing up.
+                    // https://github.com/codenameone/CodenameOne/issues/2353
+                    // https://stackoverflow.com/questions/49004370/focus-behaviour-in-textarea-in-cn1
+                    // Disabling this feature by default now, but can be re-enabled by setting
+                    // Display.getInstance().setProperty("android.reuseTextEditorOnSwitch", "true");
+                    // This editedFieldSwitch feature was added a while back to improve experience on older
+                    // Android devices where the field switching was going too slow. 
+                    // https://github.com/codenameone/CodenameOne/issues/2012
+                    // This issue was resolved in this commit (https://github.com/jaanushansen/CodenameOne/commit/f3e53a80704149e4d7cde276d01c1368bcdcfe2c)
+                    // which was submitted as part of a pull request.  This fix has been the source of several
+                    // regressions, mostly related to properties not being propagated properly when a text field is changed
+                    // However, this issue (with the cursor not showing up), doesn't appear to have a simple solution
+                    // so, I'm disabling this feature for now.
+                    isEditedFieldSwitch = "true".equals(Display.getInstance().getProperty("android.reuseTextEditorOnSwitch", "false"));
                     final String[] out = new String[1];
                     TextArea prevTextArea = null;
                     if(sInstance != null && sInstance.mLastEditText != null) {
@@ -1726,7 +1740,7 @@ private static boolean isScrollableParent(Component c){
         float pixelSize = f == null ? Display.getInstance().convertToPixels(4) : f.getPixelSize();
         while( p != null){
 
-            if(p.isScrollableY() && p.getAbsoluteY() + p.getScrollY() < Display.getInstance().getDisplayHeight() / 2 - pixelSize * 2){
+            if(Accessor.scrollableYFlag(p) && p.getAbsoluteY() + p.getScrollY() < Display.getInstance().getDisplayHeight() / 2 - pixelSize * 2){
                 return true;
             }
             p = p.getParent();

diff --git a/Ports/Android/src/com/codename1/ui/Accessor.java b/Ports/Android/src/com/codename1/ui/Accessor.java
@@ -32,4 +32,7 @@ public class Accessor {
     public static Object getNativeGraphics(Graphics g) {
         return g.getGraphics();
     }
+    public static boolean scrollableYFlag(Container c) {
+        return c.scrollableYFlag();
+    }
 }
diff --git a/Ports/iOSPort/src/com/codename1/impl/ios/IOSImplementation.java b/Ports/iOSPort/src/com/codename1/impl/ios/IOSImplementation.java
@@ -670,7 +670,7 @@ public void run() {
                 // async editing viable.  We start with half-way down the screen.
                 int keyboardClippingThresholdY = Display.getInstance().getDisplayWidth() / 2;
                 while(p != null) {
-                    if(p.isScrollableY()  && p.getAbsoluteY() < keyboardClippingThresholdY) {
+                    if(Accessor.scrollableYFlag(p)  && p.getAbsoluteY() < keyboardClippingThresholdY) {
                         break;
                     }
                     p = p.getParent();

diff --git a/Ports/iOSPort/src/com/codename1/ui/Accessor.java b/Ports/iOSPort/src/com/codename1/ui/Accessor.java
@@ -36,4 +36,8 @@ public static Object getNativeGraphics(Graphics g) {
     public static boolean isPaintPeersBehindEnabled(Graphics g) {
         return g.paintPeersBehind;
     }
+
+    public static boolean scrollableYFlag(Container cnt) {
+        return cnt.scrollableYFlag();
+    }
 }