fix(MainActivity.java): fix helpers and extra key bar apperance after…

… PIP mode switching
termux · Dec 10, 2024 · 64d6efb · 64d6efb
1 parent 8891c50
commit 64d6efb
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java
@@ -92,6 +92,7 @@ public class MainActivity extends AppCompatActivity implements View.OnApplyWindo
     private View.OnKeyListener mLorieKeyListener;
     private boolean filterOutWinKey = false;
     private boolean useTermuxEKBarBehaviour = false;
+    private boolean isInPictureInPictureMode = false;
 
     public static Prefs prefs = null;
 
@@ -340,6 +341,7 @@ private void showStylusAuxButtons(boolean show) {
         LinearLayout buttons = findViewById(R.id.mouse_helper_visibility);
         if (mClientConnected && show) {
             buttons.setVisibility(View.VISIBLE);
+            buttons.setAlpha(isInPictureInPictureMode ? 0.f : 1.f);
         } else {
             //Reset default input back to normal
             TouchInputHandler.STYLUS_INPUT_HELPER_MODE = 1;
@@ -374,13 +376,14 @@ private void makeSureHelpersAreVisibleAndInScreenBounds() {
     }
 
     public void toggleStylusAuxButtons() {
-        showMouseAuxButtons(findViewById(R.id.mouse_helper_visibility).getVisibility() != View.VISIBLE);
+        showStylusAuxButtons(findViewById(R.id.mouse_helper_visibility).getVisibility() != View.VISIBLE);
         makeSureHelpersAreVisibleAndInScreenBounds();
     }
 
     private void showMouseAuxButtons(boolean show) {
-        findViewById(R.id.mouse_buttons)
-                .setVisibility((mClientConnected && show && "1".equals(prefs.touchMode.get())) ? View.VISIBLE : View.GONE);
+        View v = findViewById(R.id.mouse_buttons);
+        v.setVisibility((mClientConnected && show && "1".equals(prefs.touchMode.get())) ? View.VISIBLE : View.GONE);
+        v.setAlpha(isInPictureInPictureMode ? 0.f : 1.f);
         makeSureHelpersAreVisibleAndInScreenBounds();
     }
 
@@ -595,7 +598,7 @@ else if (checkSelfPermission(WRITE_SECURE_SETTINGS) == PERMISSION_GRANTED)
         showMouseAuxButtons(prefs.showMouseHelper.get());
         showStylusAuxButtons(prefs.showStylusClickOverride.get());
 
-        getTerminalToolbarViewPager().setAlpha(((float) prefs.opacityEKBar.get())/100);
+        getTerminalToolbarViewPager().setAlpha(isInPictureInPictureMode ? 0.f : ((float) prefs.opacityEKBar.get())/100);
 
         lorieView.requestLayout();
         lorieView.invalidate();
@@ -644,7 +647,6 @@ private void setTerminalToolbarView() {
         boolean showNow = mClientConnected && prefs.showAdditionalKbd.get() && prefs.additionalKbdVisible.get();
 
         pager.setVisibility(showNow ? View.VISIBLE : View.INVISIBLE);
-        pager.setAlpha(isInPictureInPictureMode() ? 0.0f : 1.0f);
 
         if (showNow) {
             pager.setAdapter(new X11ToolbarViewPager.PageAdapter(this, (v, k, e) -> mInputHandler.sendKeyEvent(e)));
@@ -822,10 +824,12 @@ public void onUserLeaveHint() {
 
     @Override
     public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, @NonNull Configuration newConfig) {
-        if (isInPictureInPictureMode)
-            toggleExtraKeys(false, false);
-        else
-            setTerminalToolbarView();
+        this.isInPictureInPictureMode = isInPictureInPictureMode;
+        final ViewPager pager = getTerminalToolbarViewPager();
+        getTerminalToolbarViewPager().setAlpha(isInPictureInPictureMode ? 0.f : ((float) prefs.opacityEKBar.get())/100);
+        pager.setAlpha(isInPictureInPictureMode ? 0.f : 1.f);
+        findViewById(R.id.mouse_buttons).setAlpha(isInPictureInPictureMode ? 0.f : 1.f);
+        findViewById(R.id.mouse_helper_visibility).setAlpha(isInPictureInPictureMode ? 0.f : 1.f);
 
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
     }