PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bottom toolbar: check top margin when rearrange tabs

Browse Source 
see https://github.com/uazo/bromite-buildtools/issues/33#issuecomment-1411598157
This commit is contained in:
Carmelo Messina
2023-02-01 17:18:32 +01:00
parent b4ca08406a
commit 55fe6f07e1
1 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00109-2-Move-navigation-bar-to-bottom-fixup.patch
+45 -6
View File
@@ -3,21 +3,43 @@ Date: Mon, 30 Jan 2023 15:13:51 +0000
Subject: 109-2 Move navigation bar to bottom fixup
---
.../tasks/tab_management/TabListCoordinator.java | 5 +++--
.../DropdownItemViewInfoListManager.java | 15 +++++++++++----
2 files changed, 14 insertions(+), 6 deletions(-)
.../tab_management/TabListCoordinator.java | 20 +++++++++++--------
.../DropdownItemViewInfoListManager.java | 15 ++++++++++----
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
@@ -139,15 +139,16 @@ public class TabListCoordinator
@@ -105,7 +105,9 @@ public class TabListCoordinator
TabListRecyclerView mRecyclerView;
- int mTopPadding = 99999;
+ final int MAX_TOP_PADDING = 99999;
+ int mTopPadding = MAX_TOP_PADDING;
+
int mLastPosition = -1;
boolean mIsFirstLayout = true;
@@ -125,10 +127,10 @@ public class TabListCoordinator
@Override
public int getPaddingTop() {
if (mContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
- mTopPadding = 99999;
+ mTopPadding = MAX_TOP_PADDING;
return 0;
}
- if (mTopPadding == 99999) return super.getPaddingTop();
+ if (mTopPadding == MAX_TOP_PADDING) return super.getPaddingTop();
return mTopPadding;
}
@@ -140,26 +142,28 @@ public class TabListCoordinator
@Override
public void scrollToPositionWithOffset(int position, int offset) {
+ if (offset != 0) return;
mLastPosition = position;
- super.scrollToPositionWithOffset(position, getPaddingBottom());
+ super.scrollToPositionWithOffset(mLastPosition, getPaddingBottom());
+ super.scrollToPositionWithOffset(position, offset - getPaddingTop());
}
@Override
@@ -28,7 +50,24 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
+ if (state.isPreLayout() || state.isMeasuring()) return;
View lastView = findViewByPosition(findFirstVisibleItemPosition());
if (lastView != null) {
+ if (mTopPadding == 0) mTopPadding = MAX_TOP_PADDING;
mTopPadding = Math.min(mTopPadding, mRecyclerView.getHeight() - lastView.getHeight());
if (mIsFirstLayout) {
mIsFirstLayout = false;
- scrollToPositionWithOffset(mLastPosition, 0);
+ scrollToPositionWithOffset(mLastPosition, getPaddingTop() + getPaddingBottom());
}
}
- if (mLastPosition != -1 && mLastPosition >= state.getItemCount()) {
+ if (mLastPosition >= state.getItemCount()) {
ResetTopPosition();
- scrollToPositionWithOffset(state.getItemCount()-getSpanCount(), 0);
+ scrollToPositionWithOffset(state.getItemCount()-getSpanCount(),
+ getPaddingTop() + getPaddingBottom());
}
}
}
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManager.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManager.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManager.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManager.java