From 2bbc13ccf608f8209bbe6ee2903a5f76c650c247 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Fri, 15 Mar 2024 09:04:49 +0800
Subject: [PATCH] adjust logo and statusbar

---
 flutter/lib/common.dart                       |  2 +-
 .../lib/desktop/pages/desktop_home_page.dart  | 37 +++++++++----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index f98e1dd08..c3ba3edcf 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -3103,7 +3103,7 @@ Widget? loadLogo() {
     return Container(
       constraints: BoxConstraints(maxWidth: 300, maxHeight: 60),
       child: image,
-    ).marginOnly(bottom: 16);
+    ).marginOnly(left: 12, right: 12, top: 12);
   } else {
     return null;
   }
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index be8f085d8..78ed61a3a 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -78,6 +78,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
   Widget buildLeftPane(BuildContext context) {
     final isIncomingOnly = bind.isIncomingOnly();
     final isOutgoingOnly = bind.isOutgoingOnly();
+    final logo = loadLogo();
     final children = <Widget>[
       if (bind.isCustomClient())
         Align(
@@ -99,7 +100,12 @@ class _DesktopHomePageState extends State<DesktopHomePage>
             ),
           ).marginOnly(top: 6),
         ),
-      buildTip(context),
+      if (logo != null)
+        Align(
+          alignment: Alignment.center,
+          child: logo.marginOnly(bottom: 0.0),
+        ),
+      buildTip(context, logo),
       if (!isOutgoingOnly) buildIDBoard(context),
       if (!isOutgoingOnly) buildPasswordBoard(context),
       FutureBuilder<Widget>(
@@ -123,19 +129,15 @@ class _DesktopHomePageState extends State<DesktopHomePage>
     ];
     if (isIncomingOnly) {
       children.addAll([
-        Divider(),
-        Container(
-          margin: EdgeInsets.fromLTRB(0, 0, 8, 6),
-          child: OnlineStatusWidget(
-            onSvcStatusChanged: () {
-              if (_isInHomePage()) {
-                Future.delayed(Duration(milliseconds: 300), () {
-                  _updateWindowSize();
-                });
-              }
-            },
-          ),
-        ),
+        OnlineStatusWidget(
+          onSvcStatusChanged: () {
+            if (_isInHomePage()) {
+              Future.delayed(Duration(milliseconds: 300), () {
+                _updateWindowSize();
+              });
+            }
+          },
+        ).marginOnly(bottom: 6, right: 6)
       ]);
     }
     final textColor = Theme.of(context).textTheme.titleLarge?.color;
@@ -377,9 +379,8 @@ class _DesktopHomePageState extends State<DesktopHomePage>
     );
   }
 
-  buildTip(BuildContext context) {
+  buildTip(BuildContext context, Widget? logo) {
     final isOutgoingOnly = bind.isOutgoingOnly();
-    final logo = loadLogo();
     return Padding(
       padding:
           const EdgeInsets.only(left: 20.0, right: 16, top: 16.0, bottom: 5),
@@ -387,10 +388,6 @@ class _DesktopHomePageState extends State<DesktopHomePage>
         mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Align(
-            alignment: Alignment.center,
-            child: logo == null ? Offstage() : logo.marginOnly(bottom: 0.0),
-          ),
           Column(
             children: [
               if (!isOutgoingOnly)