From 0c2005f92fa8399d2a5dfb9a6dd66f3d0d53c41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Mon, 4 Mar 2024 16:00:05 -0500 Subject: [PATCH] TwoPaneLayout: remove clipping logic Change-Id: I04f5bfdf99429959944ed9449bbdceae8058b9e6 --- .../cx/ring/views/twopane/TwoPaneLayout.java | 43 ------------------- 1 file changed, 43 deletions(-) diff --git a/jami-android/app/src/main/java/cx/ring/views/twopane/TwoPaneLayout.java b/jami-android/app/src/main/java/cx/ring/views/twopane/TwoPaneLayout.java index f59c5a20a..ffe4de12f 100644 --- a/jami-android/app/src/main/java/cx/ring/views/twopane/TwoPaneLayout.java +++ b/jami-android/app/src/main/java/cx/ring/views/twopane/TwoPaneLayout.java @@ -211,21 +211,6 @@ public class TwoPaneLayout extends ViewGroup implements Openable { sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED); } - void updateObscuredViewsVisibility(View panel) { - boolean visibility = !mCanSlide || !isOpened; - for (int i = 0, childCount = getChildCount(); i < childCount; i++) { - final View child = getChildAt(i); - - if (child == panel) { - // There are still more children above the panel but they won't be affected. - break; - } else if (child.getVisibility() == GONE) { - continue; - } - child.setVisibility(visibility ? VISIBLE : INVISIBLE); - } - } - @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); @@ -515,10 +500,6 @@ public class TwoPaneLayout extends ViewGroup implements Openable { nextXStart += child.getWidth() + Math.abs(nextXOffset); } - if (mFirstLayout) { - updateObscuredViewsVisibility(mSlideableView); - } - mFirstLayout = false; } @@ -616,30 +597,6 @@ public class TwoPaneLayout extends ViewGroup implements Openable { return mCanSlide; } - @Override - protected boolean drawChild(Canvas canvas, View child, long drawingTime) { - final LayoutParams lp = (LayoutParams) child.getLayoutParams(); - boolean result; - final int save = canvas.save(); - - if (mCanSlide && !lp.slideable && mSlideableView != null) { - // Clip against the slider; no sense drawing what will immediately be covered. - canvas.getClipBounds(mTmpRect); - if (isLayoutRtlSupport()) { - mTmpRect.left = Math.max(mTmpRect.left, mSlideableView.getRight()); - } else { - mTmpRect.right = Math.min(mTmpRect.right, mSlideableView.getLeft()); - } - canvas.clipRect(mTmpRect); - } - - result = super.drawChild(canvas, child, drawingTime); - - canvas.restoreToCount(save); - - return result; - } - /** * @param opened position to switch to */ -- GitLab