GithubStar/QMUI_Android
1
0
Fork 0
mirror of https://github.com/Tencent/QMUI_Android.git synced 2026-10-17 04:31:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

deliver offsetPercent to QMUITabIndicator

Browse Source
This commit is contained in:
cgspine
2020-05-11 15:14:02 +08:00
parent d915f643c7
commit aaae2e7d8c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qmui/src/main/java/com/qmuiteam/qmui/widget/tab/QMUIBasicTabSegment.java
+2 -2
View File
@@ -534,7 +534,7 @@ public class QMUIBasicTabSegment extends HorizontalScrollView implements IQMUILa
if (model == null || mIndicator == null) {
return;
}
mIndicator.updateInfo(model.contentLeft, model.contentWidth, model.selectedColorAttr == 0 ? model.selectColor : QMUISkinHelper.getSkinColor(this, model.selectedColorAttr));
mIndicator.updateInfo(model.contentLeft, model.contentWidth, model.selectedColorAttr == 0 ? model.selectColor : QMUISkinHelper.getSkinColor(this, model.selectedColorAttr), 0f);
if (invalidate) {
mContentLayout.invalidate();
}
@@ -552,7 +552,7 @@ public class QMUIBasicTabSegment extends HorizontalScrollView implements IQMUILa
preModel.selectedColorAttr == 0 ? preModel.selectColor : QMUISkinHelper.getSkinColor(this, preModel.selectedColorAttr),
targetModel.selectedColorAttr == 0 ? targetModel.selectColor : QMUISkinHelper.getSkinColor(this, targetModel.selectedColorAttr),
offsetPercent);
mIndicator.updateInfo(targetLeft, targetWidth, indicatorColor);
mIndicator.updateInfo(targetLeft, targetWidth, indicatorColor, offsetPercent);
mContentLayout.invalidate();
}
qmui/src/main/java/com/qmuiteam/qmui/widget/tab/QMUITabIndicator.java
+9 -3
View File
@@ -30,6 +30,7 @@ import com.qmuiteam.qmui.util.QMUIResHelper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.graphics.drawable.DrawableCompat;
public class QMUITabIndicator {
@@ -99,7 +100,8 @@ public class QMUITabIndicator {
return mIndicatorTop;
}
protected void updateInfo(int left, int width, int color) {
@Deprecated
protected void updateInfo(int left, int width, int color){
if (mIndicatorRect == null) {
mIndicatorRect = new Rect(left, 0,
left + width, 0);
@@ -112,9 +114,13 @@ public class QMUITabIndicator {
}
}
private void updateColor(int color){
protected void updateInfo(int left, int width, int color, float offsetPercent) {
updateInfo(left, width, color);
}
protected void updateColor(int color){
if (mIndicatorDrawable != null) {
QMUIDrawableHelper.setDrawableTintColor(mIndicatorDrawable, color);
DrawableCompat.setTint(mIndicatorDrawable, color);
} else {
if (mIndicatorPaint == null) {
mIndicatorPaint = new Paint();