Merge branch '2309bug1' into 'yhkylin/v101'

fix(托盘VPN): 调整位置和窗口布局(bug#186760)

See merge request kylinos-src/kylin-nm!240

src-vpn/frontend/single-pages/singlepage.h

@@ -41,9 +41,9 @@ using namespace kdk;
 
 #define MAIN_LAYOUT_MARGINS 0,0,0,0
 #define MAIN_LAYOUT_SPACING 0
-#define TITLE_FRAME_HEIGHT 60     //TabWidget的tab和widget有间隙，和设计稿看起来一致就不能设为设计稿里的高度
+#define TITLE_FRAME_HEIGHT 50
 #define TITLE_LAYOUT_MARGINS 24,0,24,0
-#define NET_LAYOUT_MARGINS 8,8,0,8
+#define NET_LAYOUT_MARGINS 8,4,0,4
 #define TEXT_HEIGHT 20
 #define SETTINGS_LAYOUT_MARGINS 23,0,24,0
 

src-vpn/frontend/single-pages/vpnpage.cpp

@@ -629,7 +629,7 @@ void VpnPage::showUI()
 void VpnPage::resetWindowPosition()
 {
 
-#define MARGIN 4
+#define MARGIN 8
 #define PANEL_TOP 1
 #define PANEL_LEFT 2
 #define PANEL_RIGHT 3

src-vpn/frontend/single-pages/vpnpage.h

@@ -38,7 +38,7 @@
 #define VPNPAGE_LAYOUT_MARGINS 0,0,0,0
 #define VPN_LIST_SPACING 0
 #define ITEM_HEIGHT 50
-#define ITEM_SPACE 16
+#define ITEM_SPACE 8
 #define PAGE_SPACE 22
 
 #define LOG_FLAG "[VpnPage]"