完善剪裁窗口颜色拾取功能,工具栏图标同步更新
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Tue Apr 28 17:21:55 HKT 2026
|
||||
#Tue Apr 28 18:27:43 CST 2026
|
||||
stageCount=10
|
||||
libraryProject=
|
||||
baseVersion=15.0
|
||||
publishVersion=15.0.9
|
||||
buildCount=0
|
||||
buildCount=3
|
||||
baseBetaVersion=15.0.10
|
||||
|
||||
@@ -127,6 +127,7 @@ public class CropActivity extends AppCompatActivity {
|
||||
public void onColorPicked(int color) {
|
||||
int pickX = cropCanvasView.getLastPickImageX();
|
||||
int pickY = cropCanvasView.getLastPickImageY();
|
||||
colorView.setBackgroundColor(color);
|
||||
Toast.makeText(CropActivity.this,
|
||||
"颜色已拾取: #" + String.format("%06X", color & 0xFFFFFF) +
|
||||
" (" + pickX + "," + pickY + ")",
|
||||
|
||||
@@ -528,10 +528,19 @@ public class CropCanvasView extends View {
|
||||
return true;
|
||||
}
|
||||
if (event.getAction() == MotionEvent.ACTION_UP) {
|
||||
if (previewColor != 0 && previewColor != Color.TRANSPARENT) {
|
||||
backgroundColor = previewColor;
|
||||
if (canvasBounds.contains(x, y)) {
|
||||
int pickedColor;
|
||||
float imgX = screenToImageX(x);
|
||||
float imgY = screenToImageY(y);
|
||||
if (imageBounds.contains(imgX, imgY)) {
|
||||
int colorAtPoint = getImageColorAt(x, y);
|
||||
pickedColor = colorAtPoint;
|
||||
backgroundColor = colorAtPoint;
|
||||
} else {
|
||||
pickedColor = backgroundColor;
|
||||
}
|
||||
if (colorPickedListener != null) {
|
||||
colorPickedListener.onColorPicked(backgroundColor);
|
||||
colorPickedListener.onColorPicked(pickedColor);
|
||||
}
|
||||
}
|
||||
if (colorPickEndListener != null) {
|
||||
|
||||
Reference in New Issue
Block a user