Introduce shouldRedrawKeyboard for sendShiftUpEvent

yawnoc · yawnoc · commit 21b29c9f536b · 2021-07-17T17:46:59.000+08:00
diff --git a/app/src/main/java/io/github/yawnoc/strokeinput/InputContainer.java b/app/src/main/java/io/github/yawnoc/strokeinput/InputContainer.java
@@ -450,7 +450,7 @@ public boolean onTouchEvent(final MotionEvent event) {
           !isSwipeableKey(activeKey)
         )
         {
-          sendShiftUpEvent();
+          sendShiftUpEvent(true);
           break;
         }
         
@@ -603,10 +603,10 @@ private void sendShiftMoveFromEvent(
     activePointerX = x;
     activePointerY = y;
     
-    sendShiftUpEvent();
+    sendShiftUpEvent(true);
   }
   
-  private void sendShiftUpEvent() {
+  private void sendShiftUpEvent(boolean shouldRedrawKeyboard) {
     
     switch (shiftMode) {
       case SHIFT_SINGLE:
@@ -622,7 +622,10 @@ private void sendShiftUpEvent() {
     }
     
     shiftPointerId = NONEXISTENT_POINTER_ID;
-    invalidate();
+    
+    if (shouldRedrawKeyboard) {
+      invalidate();
+    }
   }
   
   private Keyboard.Key getKeyAtPoint(final int x, final int y) {

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ public boolean onTouchEvent(final MotionEvent event) {`
`450`	`450`	`!isSwipeableKey(activeKey)`
`451`	`451`	`)`
`452`	`452`	`{`
`453`		`- sendShiftUpEvent();`
	`453`	`+ sendShiftUpEvent(true);`
`454`	`454`	`break;`
`455`	`455`	`}`
`456`	`456`
`@@ -603,10 +603,10 @@ private void sendShiftMoveFromEvent(`
`603`	`603`	`activePointerX = x;`
`604`	`604`	`activePointerY = y;`
`605`	`605`
`606`		`- sendShiftUpEvent();`
	`606`	`+ sendShiftUpEvent(true);`
`607`	`607`	`}`
`608`	`608`
`609`		`- private void sendShiftUpEvent() {`
	`609`	`+ private void sendShiftUpEvent(boolean shouldRedrawKeyboard) {`
`610`	`610`
`611`	`611`	`switch (shiftMode) {`
`612`	`612`	`case SHIFT_SINGLE:`
`@@ -622,7 +622,10 @@ private void sendShiftUpEvent() {`
`622`	`622`	`}`
`623`	`623`
`624`	`624`	`shiftPointerId = NONEXISTENT_POINTER_ID;`
`625`		`- invalidate();`
	`625`	`+`
	`626`	`+ if (shouldRedrawKeyboard) {`
	`627`	`+ invalidate();`
	`628`	`+ }`
`626`	`629`	`}`
`627`	`630`
`628`	`631`	`private Keyboard.Key getKeyAtPoint(final int x, final int y) {`