From d53836735494eb2c2ad53f7f3d5e199e4b88d42a Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Fri, 10 May 2024 11:28:27 +0800 Subject: [PATCH] fix: logo display --- lib/view/page/server/detail/view.dart | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/view/page/server/detail/view.dart b/lib/view/page/server/detail/view.dart index 5e9f6cb5..02a22fd6 100644 --- a/lib/view/page/server/detail/view.dart +++ b/lib/view/page/server/detail/view.dart @@ -103,10 +103,11 @@ class _ServerDetailPageState extends State Widget _buildMainPage(Server si) { final buildFuncs = !Stores.setting.moveOutServerTabFuncBtns.fetch(); final logoUrl = si.spi.custom?.logoUrl; - final listLen = () { - var len = _cardsOrder.length; + final buildLogo = logoUrl != null; + final moreLen = () { + var len = 0; + if (buildLogo) len++; if (buildFuncs) len++; - if (logoUrl != null) len++; return len; }(); return Scaffold( @@ -130,16 +131,15 @@ class _ServerDetailPageState extends State right: 13, bottom: _media.padding.bottom + 77, ), - itemCount: listLen, + itemCount: _cardsOrder.length + moreLen, itemBuilder: (context, index) { - if (index == 0 && logoUrl != null) { + index -= moreLen; + if (index == -2 && buildLogo) { return _buildLogo(logoUrl, si.status.more[StatusCmdType.sys]?.dist); } - if (index == 1 && buildFuncs) { + if (index == -1 && buildFuncs) { return ServerFuncBtns(spi: widget.spi); } - if (logoUrl != null) index--; - if (buildFuncs) index--; return _cardBuildMap[_cardsOrder[index]]?.call(si.status); }, ),