From f47254c5e2fb4c2244f9329355dafca61469f54a Mon Sep 17 00:00:00 2001 From: 21pages Date: Sun, 4 Sep 2022 20:57:57 +0800 Subject: [PATCH] adjust geometry Signed-off-by: 21pages --- .../lib/desktop/pages/desktop_home_page.dart | 24 +++++++++---------- .../desktop/pages/desktop_setting_page.dart | 4 ++-- .../lib/desktop/widgets/peercard_widget.dart | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart index 0ccb86d1f..3ce956c23 100644 --- a/flutter/lib/desktop/pages/desktop_home_page.dart +++ b/flutter/lib/desktop/pages/desktop_home_page.dart @@ -93,8 +93,8 @@ class _DesktopHomePageState extends State buildIDBoard(BuildContext context) { final model = gFFI.serverModel; return Container( - margin: const EdgeInsets.only(left: 20, right: 16), - height: 52, + margin: const EdgeInsets.only(left: 20, right: 11), + height: 57, child: Row( crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, @@ -102,10 +102,10 @@ class _DesktopHomePageState extends State Container( width: 2, decoration: const BoxDecoration(color: MyTheme.accent), - ), + ).marginOnly(top: 5), Expanded( child: Padding( - padding: const EdgeInsets.only(left: 8.0), + padding: const EdgeInsets.only(left: 7), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -120,7 +120,7 @@ class _DesktopHomePageState extends State style: TextStyle( fontSize: 14, color: MyTheme.color(context).lightText), - ), + ).marginOnly(top: 5), buildPopupMenu(context) ], ), @@ -137,7 +137,7 @@ class _DesktopHomePageState extends State readOnly: true, decoration: const InputDecoration( border: InputBorder.none, - contentPadding: EdgeInsets.only(bottom: 18), + contentPadding: EdgeInsets.only(bottom: 20), ), style: const TextStyle( fontSize: 22, @@ -244,7 +244,7 @@ class _DesktopHomePageState extends State }, child: Obx( () => CircleAvatar( - radius: 12, + radius: 15, backgroundColor: hover.value ? MyTheme.color(context).grayBg! : MyTheme.color(context).bg!, @@ -277,7 +277,7 @@ class _DesktopHomePageState extends State ), Expanded( child: Padding( - padding: const EdgeInsets.only(left: 8.0), + padding: const EdgeInsets.only(left: 7), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -303,7 +303,7 @@ class _DesktopHomePageState extends State readOnly: true, decoration: InputDecoration( border: InputBorder.none, - contentPadding: EdgeInsets.only(bottom: 8), + contentPadding: EdgeInsets.only(bottom: 2), ), style: TextStyle(fontSize: 15), ), @@ -317,7 +317,7 @@ class _DesktopHomePageState extends State ? MyTheme.color(context).text : Color(0xFFDDDDDD), size: 22, - ).marginOnly(right: 10, bottom: 8), + ).marginOnly(right: 8, bottom: 2), ), onTap: () => bind.mainUpdateTemporaryPassword(), onHover: (value) => refreshHover.value = value, @@ -425,13 +425,13 @@ class _DesktopHomePageState extends State color: editHover.value ? MyTheme.color(context).text : Color(0xFFDDDDDD)) - .marginOnly(bottom: 8))); + .marginOnly(bottom: 2))); } buildTip(BuildContext context) { return Padding( padding: - const EdgeInsets.only(left: 20.0, right: 16, top: 16.0, bottom: 14), + const EdgeInsets.only(left: 20.0, right: 16, top: 16.0, bottom: 5), child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart index 867c8a54c..b4bb00ab8 100644 --- a/flutter/lib/desktop/pages/desktop_setting_page.dart +++ b/flutter/lib/desktop/pages/desktop_setting_page.dart @@ -49,7 +49,7 @@ class _DesktopSettingPageState extends State 'Display', Icons.desktop_windows_outlined, Icons.desktop_windows_sharp), _TabInfo('Audio', Icons.volume_up_outlined, Icons.volume_up_sharp), _TabInfo('Connection', Icons.link_outlined, Icons.link_sharp), - _TabInfo('About RustDesk', Icons.info_outline, Icons.info_sharp) + _TabInfo('About', Icons.info_outline, Icons.info_sharp) ]; late PageController controller; @@ -714,7 +714,7 @@ class _AboutState extends State<_About> { ], ).marginOnly(left: _kContentHMargin) ]), - ]).marginOnly(left: _kCardLeftMargin); + ]); }); } } diff --git a/flutter/lib/desktop/widgets/peercard_widget.dart b/flutter/lib/desktop/widgets/peercard_widget.dart index 1bff02508..13ab92ffe 100644 --- a/flutter/lib/desktop/widgets/peercard_widget.dart +++ b/flutter/lib/desktop/widgets/peercard_widget.dart @@ -48,7 +48,7 @@ class _PeerCard extends StatefulWidget { class _PeerCardState extends State<_PeerCard> with AutomaticKeepAliveClientMixin { var _menuPos = RelativeRect.fill; - final double _cardRadis = 20; + final double _cardRadis = 16; final double _borderWidth = 2; final RxBool _iconMoreHover = false.obs;