linshenjianlu/ShortX_ToolHub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: enlarge color picker actions to match settings

Browse Source
This commit is contained in:
7015725
2026-05-22 03:47:39 +08:00
parent 9c3b628a83
commit ad58737c67
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/th_14_panels.js
View File

@@ -5818,13 +5818,13 @@ FloatBallAppWM.prototype.showColorPickerPopup = function(opts) {
try { b.setBackground(self.ui.createStrokeDrawable(T.primaryDeep, self.withAlpha(T.brown || T.primaryDeep, isDark ? 0.28 : 0.18), self.dp(1), self.dp(22))); } catch(eBg1) {} try { b.setBackground(self.ui.createStrokeDrawable(T.primaryDeep, self.withAlpha(T.brown || T.primaryDeep, isDark ? 0.28 : 0.18), self.dp(1), self.dp(22))); } catch(eBg1) {}
try { b.setElevation(self.dp(1)); } catch(eElev) {} try { b.setElevation(self.dp(1)); } catch(eElev) {}
} else { } else {
// 与按钮管理页 action chip 一致：浅底、小胶囊、34dp 高。 // 与设置页按钮一致：次级也用大圆角按钮，不再做小 chip。
b.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 12); b.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 14);
// 次级按钮走设置页里的奶油/描边感，不再用薄荷绿底。 // 次级按钮走设置页里的奶油/描边感，不再用薄荷绿底。
b.setTextColor(T.brown || T.sub); b.setTextColor(T.brown || T.sub);
b.setPadding(self.dp(10), 0, self.dp(10), 0); b.setPadding(self.dp(16), 0, self.dp(16), 0);
try { b.setMinHeight(self.dp(34)); } catch(eMinH2) {} try { b.setMinHeight(self.dp(44)); } catch(eMinH2) {}
try { b.setBackground(self.ui.createStrokeDrawable(T.card2 || T.card, self.withAlpha(T.stroke || T.brown, isDark ? 0.42 : 0.55), self.dp(1), self.dp(14))); } catch(eBg2) {} try { b.setBackground(self.ui.createStrokeDrawable(T.card2 || T.card, self.withAlpha(T.stroke || T.brown, isDark ? 0.42 : 0.55), self.dp(1), self.dp(22))); } catch(eBg2) {}
try { b.setElevation(self.dp(1)); } catch(eElev2) {} try { b.setElevation(self.dp(1)); } catch(eElev2) {}
} }
try { b.setClickable(true); b.setFocusable(true); } catch(eClickable) {} try { b.setClickable(true); b.setFocusable(true); } catch(eClickable) {}
@@ -5854,8 +5854,9 @@ FloatBallAppWM.prototype.showColorPickerPopup = function(opts) {
alphaValTv.setText("255"); alphaValTv.setText("255");
currentAlphaByte = 255; currentAlphaByte = 255;
}); });
var clearLp = new android.widget.LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams.WRAP_CONTENT, self.dp(34)); var clearLp = new android.widget.LinearLayout.LayoutParams(0, self.dp(44));
clearLp.setMargins(0, 0, self.dp(10), 0); clearLp.weight = 1;
clearLp.setMargins(0, 0, self.dp(6), 0);
actionRow.addView(btnClear, clearLp); actionRow.addView(btnClear, clearLp);
var btnOk = createColorPanelActionButton("保存颜色", true, function() { var btnOk = createColorPanelActionButton("保存颜色", true, function() {
@@ -5876,7 +5877,7 @@ FloatBallAppWM.prototype.showColorPickerPopup = function(opts) {
}); });
var okLp = new android.widget.LinearLayout.LayoutParams(0, self.dp(44)); var okLp = new android.widget.LinearLayout.LayoutParams(0, self.dp(44));
okLp.weight = 1; okLp.weight = 1;
okLp.setMargins(0, 0, 0, 0); okLp.setMargins(self.dp(6), 0, 0, 0);
actionRow.addView(btnOk, okLp); actionRow.addView(btnOk, okLp);
content.addView(actionRow, new android.widget.LinearLayout.LayoutParams( content.addView(actionRow, new android.widget.LinearLayout.LayoutParams(

6
manifest.json
View File

@@ -54,8 +54,8 @@
"size": 21198 "size": 21198
}, },
"th_14_panels.js": { "th_14_panels.js": {
"sha256": "2eada8040ac95017485c274b306a0d88c8cbc74affd36c548787ff8de4db7eb3", "sha256": "ccfedd74d601187d0d47b03f6140a0fcae20dc49d503c3c923062f50fa1c1efb",
"size": 292874 "size": 292861
}, },
"th_15_extra.js": { "th_15_extra.js": {
"sha256": "11a9866ba156c2a7862633530eb0d796a9955698a0c3fad4199dcccd4bb27c47", "sha256": "11a9866ba156c2a7862633530eb0d796a9955698a0c3fad4199dcccd4bb27c47",
@@ -68,5 +68,5 @@
}, },
"keyId": "toolhub-targets-2026-rsa3072", "keyId": "toolhub-targets-2026-rsa3072",
"schema": 2, "schema": 2,
"version": 20260521194347 "version": 20260521194735
} }

2
manifest.sig
View File

@@ -1 +1 @@
dAH5Rfzst4Joce5HQHBzDWUm/YGwEFiAROj8d5yER7PY7C6d81fwrK2NcXx9ll9MxgAjphry4697lWcTSNUi3tKwzeISFAyRqNT6Kl4pOOUTqUgRKtMtICjg+EDCollqIdNIH+MUroUSnP22uEDs9zaimGiwGyxayuk/VoyVJ5toyUPJ3zXWOHp6+vO11QvcDcYPxpkQq+2KLsbKz0Hh/4RRq3RWdX2BEYmPrEwHV/QzuOXwkB9BlRcFrUYuPwz997v0+8tNqeNBCLCSNPRKVWO6jWGpd7/ct/sHNzNpQLmLtEdfRElZMgc9QdWZyy7EdzaxthsKlJSzWnCUTz23kNha9ADEust7jfTTm9AHzSaKSRrLebVtZjVf7+3ccImk+wJphBFJjQEThKuluSYNb6D58egXKlGOBpauC0MSuL1qfM+AQGTq0rkNSAf3dZ3+YLm6gWnFFJRc8hAtxaueJBqT8aNuJcK4BkL1ysYUr5sKuztFtn5ml5CnJCKiC/CD Q/28vC4oUJ4j/Z97cJmt+EQ2RzXIxjAwYo6aHBfuWMZ0Q/ZWt0yPPMoh0MKkvqJCVeLKMbGJ+wVuTwtXclURGWy0S8AYAGw41lQcnmFukGXFCwdTmDwm35+mmIng5W/OHNfrrOEN1U4HSpwHZDpREpS8OANcMGZDh7JJmPwZOZi6LP0rmuy2MNuGTeDjljx7SaWff+8BzMgsGy2ad+iNupsF92s7hIcSQrT2Tf5ozLp2Z0qF7ve/4ZaKj4y9rtSgcov2dlimH+IC9HsC2drO04H0ws16QYcOO2o6UxbWtQyg131UYVUIZcGJyC6dTO71h3yLBOJ/YZ527JXWdhofTOn6dmk5wxjZimx02ajwswxfC0Qyg60aSLJ5rZeyYDPJlCZb05yo6cyNBlp9+fTG0GbjXGj4Kxq9orLHyqgiegsuIkNoNwe10G51iUy/GDRUmznn1SeNXpGhfiUGoqukhOA1xcGy/ndetuscpQmM2PKSu0mq3vuBhwxysvL37q1m