From aa0d1e7cca49eeaa1116843619cacf7d879846eb Mon Sep 17 00:00:00 2001 From: zhangyuanyuan1 Date: Mon, 19 Sep 2022 17:33:57 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20bug=20140440=20=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=E9=97=B4=E8=B7=9D=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/list-items/listitem.cpp | 8 ++++---- src/frontend/tab-pages/tabpage.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/frontend/list-items/listitem.cpp b/src/frontend/list-items/listitem.cpp index 2cfe9a9f..e6809c1d 100644 --- a/src/frontend/list-items/listitem.cpp +++ b/src/frontend/list-items/listitem.cpp @@ -22,9 +22,9 @@ #define MAIN_LAYOUT_MARGINS 0,0,0,0 #define MAIN_LAYOUT_SPACING 0 -#define ITEM_FRAME_MARGINS 16,6,16,6 -#define ITEM_FRAME_SPACING 10 -#define FRAME_WIDTH 395 +#define ITEM_FRAME_MARGINS 12,6,16,6 +#define ITEM_FRAME_SPACING 8 +#define FRAME_WIDTH 404 #define INFO_ICON_WIDTH 16 #define INFO_ICON_HEIGHT 16 #define LIGHT_HOVER_COLOR QColor(240,240,240,255) @@ -155,7 +155,7 @@ void ListItem::initUI() m_hItemLayout = new QHBoxLayout(m_itemFrame); m_hItemLayout->setContentsMargins(ITEM_FRAME_MARGINS); -// m_hItemLayout->setSpacing(ITEM_FRAME_SPACING); + m_hItemLayout->setSpacing(ITEM_FRAME_SPACING); m_netButton = new RadioItemButton(m_itemFrame); m_nameLabel = new FixLabel(m_itemFrame); diff --git a/src/frontend/tab-pages/tabpage.h b/src/frontend/tab-pages/tabpage.h index 33084053..a673d4a7 100644 --- a/src/frontend/tab-pages/tabpage.h +++ b/src/frontend/tab-pages/tabpage.h @@ -58,14 +58,14 @@ enum network_mode { #define NET_LIST_SPACING 0 #define TEXT_MARGINS 16,0,0,0 //#define SCROLL_AREA_HEIGHT 200 -#define SETTINGS_LAYOUT_MARGINS 24,0,24,0 +#define SETTINGS_LAYOUT_MARGINS 23,0,24,0 #define TRANSPARENT_COLOR QColor(0,0,0,0) #define INACTIVE_AREA_MIN_HEIGHT 170 #define ACTIVE_AREA_MAX_HEIGHT 92 #define MAX_ITEMS 4 -#define MAX_WIDTH 408 -#define MIN_WIDTH 396 +#define MAX_WIDTH 412 +#define MIN_WIDTH 404 #define SCROLL_STEP 4