Move ToolApp header upward

This commit is contained in:
7015725
2026-05-23 05:09:25 +08:00
parent 00508c9cde
commit aa4ef421fe
3 changed files with 8 additions and 10 deletions

View File

@@ -896,7 +896,7 @@ FloatBallAppWM.prototype.buildToolAppPreviewBody = function(entry) {
try { btnClose.setBackground(this.ui.createStrokeDrawable(T.primarySoft, this.withAlpha(T.primaryDeep, isDark ? 0.30 : 0.22), this.dp(1), this.dp(18))); } catch(eRightBg) {} try { btnClose.setBackground(this.ui.createStrokeDrawable(T.primarySoft, this.withAlpha(T.primaryDeep, isDark ? 0.30 : 0.22), this.dp(1), this.dp(18))); } catch(eRightBg) {}
bar.addView(btnClose, new android.widget.LinearLayout.LayoutParams(this.dp(104), this.dp(38))); bar.addView(btnClose, new android.widget.LinearLayout.LayoutParams(this.dp(104), this.dp(38)));
var barLp = new android.widget.LinearLayout.LayoutParams(-1, topBarHeight); var barLp = new android.widget.LinearLayout.LayoutParams(-1, topBarHeight);
barLp.setMargins(this.dp(8), this.dp(8), this.dp(8), this.dp(4)); barLp.setMargins(this.dp(8), this.dp(2), this.dp(8), this.dp(4));
body.addView(bar, barLp); body.addView(bar, barLp);
var host = new android.widget.FrameLayout(context); var host = new android.widget.FrameLayout(context);
@@ -1332,10 +1332,8 @@ FloatBallAppWM.prototype.buildToolAppShell = function(contentView, title, canBac
var spec = this.getToolAppResponsiveSpec ? this.getToolAppResponsiveSpec() : null; var spec = this.getToolAppResponsiveSpec ? this.getToolAppResponsiveSpec() : null;
var shellPad = spec ? spec.shellPadding : this.dp(6); var shellPad = spec ? spec.shellPadding : this.dp(6);
var shellTopPad = shellPad; var shellTopPad = shellPad;
try { // ToolApp 是 WindowManager 浮层卡片,不需要额外叠加状态栏 inset
var topInset = this.getToolAppStatusBarInsetPx ? this.getToolAppStatusBarInsetPx() : 0; // 否则一级/二级页面标题上方会出现一块空白。
if (!isNaN(topInset) && topInset > 0) shellTopPad = shellPad + topInset;
} catch(eTopInset) {}
var outerRadius = spec ? spec.outerRadius : this.dp(26); var outerRadius = spec ? spec.outerRadius : this.dp(26);
var topBarHeight = spec ? spec.topBarHeight : this.dp(56); var topBarHeight = spec ? spec.topBarHeight : this.dp(56);
var rootDownX = 0; var rootDownX = 0;
@@ -1544,7 +1542,7 @@ FloatBallAppWM.prototype.buildToolAppShell = function(contentView, title, canBac
try { btnClose.setBackground(this.ui.createStrokeDrawable(T.primarySoft, this.withAlpha(T.primaryDeep, isDark ? 0.30 : 0.22), this.dp(1), this.dp(18))); } catch(eRightBg) {} try { btnClose.setBackground(this.ui.createStrokeDrawable(T.primarySoft, this.withAlpha(T.primaryDeep, isDark ? 0.30 : 0.22), this.dp(1), this.dp(18))); } catch(eRightBg) {}
bar.addView(btnClose, new android.widget.LinearLayout.LayoutParams(this.dp(104), this.dp(38))); bar.addView(btnClose, new android.widget.LinearLayout.LayoutParams(this.dp(104), this.dp(38)));
var barLp = new android.widget.LinearLayout.LayoutParams(-1, topBarHeight); var barLp = new android.widget.LinearLayout.LayoutParams(-1, topBarHeight);
barLp.setMargins(this.dp(8), this.dp(8), this.dp(8), this.dp(4)); barLp.setMargins(this.dp(8), this.dp(2), this.dp(8), this.dp(4));
body.addView(bar, barLp); body.addView(bar, barLp);
var host = new android.widget.FrameLayout(context); var host = new android.widget.FrameLayout(context);

View File

@@ -70,8 +70,8 @@
"size": 20484 "size": 20484
}, },
"th_15_extra.js": { "th_15_extra.js": {
"sha256": "c62972b4aa3c5dbc2463369fc96639683f6ea4d50a05e9befcc5b6a01679706c", "sha256": "8ec00dbb048a139ea1b729e84c72db2f73a0eb8c64ccfd5957952daa631a8642",
"size": 127020 "size": 126972
}, },
"th_16_entry.js": { "th_16_entry.js": {
"sha256": "652aa70214a9419923785e528a067d3828094fde48fc9c8c57cfda1e08206e25", "sha256": "652aa70214a9419923785e528a067d3828094fde48fc9c8c57cfda1e08206e25",
@@ -80,5 +80,5 @@
}, },
"keyId": "toolhub-targets-2026-rsa3072", "keyId": "toolhub-targets-2026-rsa3072",
"schema": 2, "schema": 2,
"version": 20260522205509 "version": 20260522210920
} }

View File

@@ -1 +1 @@
SVao3uez5Z2KGYM67Z2dBrE9SPCjndmDaO89a1ybmqkRUCECt/MWc1MWhFyOcUqt57Pq0ljwNCWSdDLnbjZA7+AQPaEOhJdlyemJeeD+TkT9lQKXHxnSwn5Uq9wxYeRdpp3xid4+oRDwYLNUWp+cxTdFjiC2Aah7RWS4rm/T+t+3iqaHfqEav9dw1C1vskvRqaQfuNRF5ss/JDfR20UcoqtiHgFsB2VTyYP5MAs0Mj4po8DpOk4C1eLjS8dzZwW8r26xWvU/U7r4nTtOzsc07G/kX4aGq6G/TMaB6YYqMo9zDkBTvXgGx7SLC28W/tw5yTgvLN0cghdK5QmvB2dVxW7PC3njl5a/ew+qohfJ7GPCV4YJ8XxAFiUaI+wfT2mMGvTyWUlY6DWnCzzZh2x+7OFpQjiKlerJY0iugbC4bhQXpU2C5lnd6ER6hQVKFeeKTydzDTyEWHcJ59vx1wyz3oIkDH8BfHCIhgdlAhRiJWB2abaMPX6he5BcNcsGHPgA lCaCnyAoHDFSS7cgmQ4nlX7J8ZsdK8UdBXztNCZgAGye8ITxnxYMzRns4EfRfeIlrWoeO3WKY+DKwhL6YSA7tcWgHEv+RGRaeKP2rkaZrGX9kOSIZgCuyW5FeFSuac3i2MwTxGEpXA228HhGH/thMJmGu7on74yDvnB75tzumwEqzuyfAx5FMM7qMv3xHfy4yF3XOhjQGJHW6Mo7gzRdZvQ804OMlKcHj0J1OOTQByKYvsD03UeXB6L1QocwIyRNgST8VEo8j11qtehVaxzG+zWo9n1cFdIzjIQ/Q4RPEED+Xo+/L6JKdEEy5hjk0DaC5uBsTQEYqhO+h2ApUdKdZ5o0kF+bFHIZYGwA720rj014enSpWrXnLCbyXKxHCnsaOQ8b10w+r8V2dwV2F36N5n1Sng5USj9PYePm5+7hyN6BxoJBSR+YWcKmpCVU8XXMLKjSOiI+z21i10RXLAtYLxGAqyuBPhBhFWE2dzXgWS8H0NgHCKDxylAYSMKs2ryb