tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.6.3 - Alpha - 修复调色盘对话框可能无限叠加的问题

Browse Source
This commit is contained in:
SuperMonster003
2025-04-19 17:36:33 +08:00
parent d0b5a8fbad
commit 0867e9976b
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/color-picker/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerDialog.java
View File

@@ -125,8 +125,8 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
private static final String ARG_USE_LEGACY_MODE = "useLegacyMode";
ColorPickerDialogListener colorPickerDialogListener;
View.OnClickListener oldColorPanelOnClickListener;
View.OnClickListener newColorPanelOnClickListener;
OnClickListener oldColorPanelOnClickListener;
OnClickListener newColorPanelOnClickListener;
Consumer<ColorPickerDialog> colorHistoriesHandler;
FrameLayout rootView;
@@ -361,7 +361,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
if (!useLegacyMode) {
oldColorPanel.setOnClickListener(v -> {
v.setTag(oldColorPanel.getColor());
oldColorPanelOnClickListener.onClick(v);
oldColorPanelOnClickListener.onClick(v, this);
});
oldColorPanel.setOnLongClickListener(v -> {
resetColorPanel();
@@ -369,7 +369,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
});
newColorPanel.setOnClickListener(v -> {
v.setTag(newColorPanel.getColor());
newColorPanelOnClickListener.onClick(v);
newColorPanelOnClickListener.onClick(v, this);
});
newColorPanel.setOnLongClickListener(v -> {
int aimColor = colorPicker.lastColor;
@@ -861,8 +861,8 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
int colorShape = ColorShape.CIRCLE;
boolean useLegacyMode = false;
View.OnClickListener oldColorPanelOnClickListener;
View.OnClickListener newColorPanelOnClickListener;
OnClickListener oldColorPanelOnClickListener;
OnClickListener newColorPanelOnClickListener;
Consumer<ColorPickerDialog> colorHistoriesHandler;
/*package*/ Builder() {
@@ -1018,12 +1018,12 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
return this;
}
public Builder setOldColorPanelOnClickListener(View.OnClickListener onClickListener) {
public Builder setOldColorPanelOnClickListener(OnClickListener onClickListener) {
this.oldColorPanelOnClickListener = onClickListener;
return this;
}
public Builder setNewColorPanelOnClickListener(View.OnClickListener onClickListener) {
public Builder setNewColorPanelOnClickListener(OnClickListener onClickListener) {
this.newColorPanelOnClickListener = onClickListener;
return this;
}
@@ -1074,4 +1074,8 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
}
// endregion
public static interface OnClickListener {
void onClick(View view, ColorPickerDialog dialog);
}
}