From 749a1d2da2ae4a19b7323879df04af473be09d26 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Mon, 26 Feb 2024 17:49:12 +0800
Subject: [PATCH] support logo.png

---
 flutter/lib/common.dart                        | 11 +++++++++++
 flutter/lib/desktop/pages/server_page.dart     |  6 +-----
 flutter/lib/desktop/widgets/tabbar_widget.dart |  9 +++------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 95f26b445..5dd33f14b 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -3071,3 +3071,14 @@ Color? disabledTextColor(BuildContext context, bool enabled) {
       ? null
       : Theme.of(context).textTheme.titleLarge?.color?.withOpacity(0.6);
 }
+
+Widget loadLogo(double size) {
+  return Image.asset('assets/logo.png',
+      width: size,
+      height: size,
+      errorBuilder: (ctx, error, stackTrace) => SvgPicture.asset(
+            'assets/logo.svg',
+            width: size,
+            height: size,
+          ));
+}
diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart
index 75c8eb78c..2959d6f5c 100644
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -327,11 +327,7 @@ class _AppIcon extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       margin: EdgeInsets.symmetric(horizontal: 4.0),
-      child: SvgPicture.asset(
-        'assets/logo.svg',
-        width: 30,
-        height: 30,
-      ),
+      child: loadLogo(30),
     );
   }
 }
diff --git a/flutter/lib/desktop/widgets/tabbar_widget.dart b/flutter/lib/desktop/widgets/tabbar_widget.dart
index f2e4e7d7f..b371012ff 100644
--- a/flutter/lib/desktop/widgets/tabbar_widget.dart
+++ b/flutter/lib/desktop/widgets/tabbar_widget.dart
@@ -399,12 +399,9 @@ class DesktopTab extends StatelessWidget {
                       offstage: kUseCompatibleUiMode || Platform.isMacOS,
                       child: Row(children: [
                         Offstage(
-                            offstage: !showLogo,
-                            child: SvgPicture.asset(
-                              'assets/logo.svg',
-                              width: 16,
-                              height: 16,
-                            )),
+                          offstage: !showLogo,
+                          child: loadLogo(16),
+                        ),
                         Offstage(
                             offstage: !showTitle,
                             child: const Text(