From 7b3bbdf964bc974a6734b9da03fe7b36f2e2261b Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Sun, 29 May 2022 19:55:50 +0800
Subject: [PATCH] feat: add customed titlebar
---
.../lib/desktop/pages/desktop_home_page.dart | 54 +++-
.../desktop/pages/desktop_remote_page.dart | 16 -
.../lib/desktop/widgets/titlebar_widget.dart | 66 ++++
flutter/lib/main.dart | 34 ++-
flutter/linux/my_application.cc | 5 +-
flutter/macos/Runner/MainFlutterWindow.swift | 7 +-
flutter/pubspec.lock | 281 ++++++++++--------
flutter/pubspec.yaml | 1 +
flutter/windows/runner/main.cpp | 2 +
9 files changed, 296 insertions(+), 170 deletions(-)
delete mode 100644 flutter/lib/desktop/pages/desktop_remote_page.dart
create mode 100644 flutter/lib/desktop/widgets/titlebar_widget.dart
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index 90566e165..1d0cd2b9d 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_hbb/common.dart';
import 'package:flutter_hbb/desktop/pages/connection_page.dart';
+import 'package:flutter_hbb/desktop/widgets/titlebar_widget.dart';
import 'package:flutter_hbb/models/model.dart';
import 'package:provider/provider.dart';
@@ -11,26 +12,49 @@ class DesktopHomePage extends StatefulWidget {
State<StatefulWidget> createState() => _DesktopHomePageState();
}
+const borderColor = Color(0xFF2F65BA);
+
class _DesktopHomePageState extends State<DesktopHomePage> {
@override
Widget build(BuildContext context) {
return Scaffold(
- body: Container(
- child: Row(
- children: [
- Flexible(
- child: buildServerInfo(context),
- flex: 1,
+ body: Column(
+ children: [
+ Row(
+ children: [
+ DesktopTitleBar(
+ child: Center(
+ child: Text(
+ "RustDesk",
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 20,
+ fontWeight: FontWeight.bold),
+ ),
+ ),
+ )
+ ],
+ ),
+ Expanded(
+ child: Container(
+ child: Row(
+ children: [
+ Flexible(
+ child: buildServerInfo(context),
+ flex: 1,
+ ),
+ SizedBox(
+ width: 16.0,
+ ),
+ Flexible(
+ child: buildServerBoard(context),
+ flex: 4,
+ ),
+ ],
+ ),
),
- SizedBox(
- width: 16.0,
- ),
- Flexible(
- child: buildServerBoard(context),
- flex: 4,
- ),
- ],
- ),
+ ),
+ ],
),
);
}
diff --git a/flutter/lib/desktop/pages/desktop_remote_page.dart b/flutter/lib/desktop/pages/desktop_remote_page.dart
deleted file mode 100644
index 748e4cf3c..000000000
--- a/flutter/lib/desktop/pages/desktop_remote_page.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// Remote Page, use it in multi window context
-class DesktopRemotePage extends StatefulWidget {
- const DesktopRemotePage({Key? key}) : super(key: key);
-
- @override
- State<DesktopRemotePage> createState() => _DesktopRemotePageState();
-}
-
-class _DesktopRemotePageState extends State<DesktopRemotePage> {
- @override
- Widget build(BuildContext context) {
- return Container();
- }
-}
diff --git a/flutter/lib/desktop/widgets/titlebar_widget.dart b/flutter/lib/desktop/widgets/titlebar_widget.dart
new file mode 100644
index 000000000..f238cb4cd
--- /dev/null
+++ b/flutter/lib/desktop/widgets/titlebar_widget.dart
@@ -0,0 +1,66 @@
+import 'package:bitsdojo_window/bitsdojo_window.dart';
+import 'package:flutter/material.dart';
+
+const sidebarColor = Color(0xFF0C6AF6);
+const backgroundStartColor = Color(0xFF7BBCF5);
+const backgroundEndColor = Color(0xFF0CCBF6);
+
+class DesktopTitleBar extends StatelessWidget {
+ final Widget? child;
+
+ const DesktopTitleBar({Key? key, this.child}) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return Expanded(
+ child: Container(
+ decoration: const BoxDecoration(
+ gradient: LinearGradient(
+ begin: Alignment.topCenter,
+ end: Alignment.bottomCenter,
+ colors: [backgroundStartColor, backgroundEndColor],
+ stops: [0.0, 1.0]),
+ ),
+ child: WindowTitleBarBox(
+ child: Row(
+ children: [
+ Expanded(
+ child: MoveWindow(
+ child: child,
+ )),
+ const WindowButtons()
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+}
+
+final buttonColors = WindowButtonColors(
+ iconNormal: const Color(0xFF805306),
+ mouseOver: const Color(0xFFF6A00C),
+ mouseDown: const Color(0xFF805306),
+ iconMouseOver: const Color(0xFF805306),
+ iconMouseDown: const Color(0xFFFFD500));
+
+final closeButtonColors = WindowButtonColors(
+ mouseOver: const Color(0xFFD32F2F),
+ mouseDown: const Color(0xFFB71C1C),
+ iconNormal: const Color(0xFF805306),
+ iconMouseOver: Colors.white);
+
+class WindowButtons extends StatelessWidget {
+ const WindowButtons({Key? key}) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return Row(
+ children: [
+ MinimizeWindowButton(colors: buttonColors),
+ MaximizeWindowButton(colors: buttonColors),
+ CloseWindowButton(colors: closeButtonColors),
+ ],
+ );
+ }
+}
diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart
index 2ab1586f0..1d8d6ab57 100644
--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@@ -1,12 +1,12 @@
import 'dart:convert';
+import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart';
import 'package:flutter_hbb/desktop/screen/desktop_remote_screen.dart';
import 'package:flutter_hbb/utils/multi_window_manager.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:provider/provider.dart';
-import 'package:window_manager/window_manager.dart';
import 'common.dart';
import 'mobile/pages/home_page.dart';
@@ -50,22 +50,28 @@ void runRustDeskApp(List<String> args) async {
}
} else {
// main window
- await windowManager.ensureInitialized();
+ // await windowManager.ensureInitialized();
// start service
FFI.serverModel.startService();
- WindowOptions windowOptions = WindowOptions(
- size: Size(1280, 720),
- center: true,
- backgroundColor: Colors.transparent,
- skipTaskbar: false,
- titleBarStyle: TitleBarStyle.normal,
- );
- windowManager.waitUntilReadyToShow(windowOptions, () async {
- await windowManager.show();
- await windowManager.focus();
- });
-
+ // WindowOptions windowOptions = WindowOptions(
+ // size: Size(1280, 720),
+ // center: true,
+ // backgroundColor: Colors.transparent,
+ // skipTaskbar: false,
+ // titleBarStyle: TitleBarStyle.normal,
+ // );
+ // windowManager.waitUntilReadyToShow(windowOptions, () async {
+ // await windowManager.show();
+ // await windowManager.focus();
+ // });
runApp(App());
+ doWhenWindowReady(() {
+ const initialSize = Size(1280, 720);
+ appWindow.minSize = initialSize;
+ appWindow.size = initialSize;
+ appWindow.alignment = Alignment.center;
+ appWindow.show();
+ });
}
}
diff --git a/flutter/linux/my_application.cc b/flutter/linux/my_application.cc
index fbbf4ab0d..64d6e614a 100644
--- a/flutter/linux/my_application.cc
+++ b/flutter/linux/my_application.cc
@@ -1,6 +1,7 @@
#include "my_application.h"
#include <flutter_linux/flutter_linux.h>
+#include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
@@ -47,7 +48,9 @@ static void my_application_activate(GApplication* application) {
gtk_window_set_title(window, "flutter_hbb");
}
- gtk_window_set_default_size(window, 1280, 720);
+ auto bdw = bitsdojo_window_from(window); // <--- add this line
+ bdw->setCustomFrame(true); // <-- add this line
+ //gtk_window_set_default_size(window, 1280, 720); // <-- comment this line
gtk_widget_show(GTK_WIDGET(window));
g_autoptr(FlDartProject) project = fl_dart_project_new();
diff --git a/flutter/macos/Runner/MainFlutterWindow.swift b/flutter/macos/Runner/MainFlutterWindow.swift
index 2722837ec..f3ed804b1 100644
--- a/flutter/macos/Runner/MainFlutterWindow.swift
+++ b/flutter/macos/Runner/MainFlutterWindow.swift
@@ -1,7 +1,8 @@
import Cocoa
import FlutterMacOS
+import bitsdojo_window_macos
-class MainFlutterWindow: NSWindow {
+class MainFlutterWindow: BitsdojoWindow {
override func awakeFromNib() {
let flutterViewController = FlutterViewController.init()
let windowFrame = self.frame
@@ -12,4 +13,8 @@ class MainFlutterWindow: NSWindow {
super.awakeFromNib()
}
+
+ override func bitsdojo_window_configure() -> UInt {
+ return BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP
+ }
}
diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock
index 2f7f30ec9..0c82ce182 100644
--- a/flutter/pubspec.lock
+++ b/flutter/pubspec.lock
@@ -5,196 +5,231 @@ packages:
dependency: transitive
description:
name: archive
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "3.3.0"
args:
dependency: transitive
description:
name: args
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.3.1"
async:
dependency: transitive
description:
name: async
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.8.2"
+ bitsdojo_window:
+ dependency: "direct main"
+ description:
+ name: bitsdojo_window
+ url: "https://pub.flutter-io.cn"
+ source: hosted
+ version: "0.1.2"
+ bitsdojo_window_linux:
+ dependency: transitive
+ description:
+ name: bitsdojo_window_linux
+ url: "https://pub.flutter-io.cn"
+ source: hosted
+ version: "0.1.2"
+ bitsdojo_window_macos:
+ dependency: transitive
+ description:
+ name: bitsdojo_window_macos
+ url: "https://pub.flutter-io.cn"
+ source: hosted
+ version: "0.1.2"
+ bitsdojo_window_platform_interface:
+ dependency: transitive
+ description:
+ name: bitsdojo_window_platform_interface
+ url: "https://pub.flutter-io.cn"
+ source: hosted
+ version: "0.1.2"
+ bitsdojo_window_windows:
+ dependency: transitive
+ description:
+ name: bitsdojo_window_windows
+ url: "https://pub.flutter-io.cn"
+ source: hosted
+ version: "0.1.2"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.0"
characters:
dependency: transitive
description:
name: characters
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.2.0"
charcode:
dependency: transitive
description:
name: charcode
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.1"
clock:
dependency: transitive
description:
name: clock
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
collection:
dependency: transitive
description:
name: collection
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.16.0"
cross_file:
dependency: transitive
description:
name: cross_file
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "0.3.3"
+ version: "0.3.3+1"
crypto:
dependency: transitive
description:
name: crypto
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.2"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.4"
dash_chat:
dependency: "direct main"
description:
name: dash_chat
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.16"
desktop_multi_window:
dependency: "direct main"
description:
name: desktop_multi_window
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.0.2"
device_info:
dependency: "direct main"
description:
name: device_info
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.3"
device_info_platform_interface:
dependency: transitive
description:
name: device_info_platform_interface
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.1"
draggable_float_widget:
dependency: "direct main"
description:
name: draggable_float_widget
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.0.2"
event_bus:
dependency: transitive
description:
name: event_bus
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
external_path:
dependency: "direct main"
description:
name: external_path
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.1"
fake_async:
dependency: transitive
description:
name: fake_async
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.0"
ffi:
dependency: "direct main"
description:
name: ffi
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.2.1"
file:
dependency: transitive
description:
name: file
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "6.1.2"
firebase_analytics:
dependency: "direct main"
description:
name: firebase_analytics
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "9.1.8"
+ version: "9.1.9"
firebase_analytics_platform_interface:
dependency: transitive
description:
name: firebase_analytics_platform_interface
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "3.1.6"
+ version: "3.1.7"
firebase_analytics_web:
dependency: transitive
description:
name: firebase_analytics_web
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "0.4.0+13"
+ version: "0.4.0+14"
firebase_core:
dependency: transitive
description:
name: firebase_core
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.17.0"
+ version: "1.17.1"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "4.4.0"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.6.4"
fixnum:
dependency: transitive
description:
name: fixnum
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.1"
flutter:
@@ -206,42 +241,42 @@ packages:
dependency: "direct main"
description:
name: flutter_breadcrumb
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.1"
flutter_launcher_icons:
dependency: "direct dev"
description:
name: flutter_launcher_icons
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.9.2"
flutter_parsed_text:
dependency: transitive
description:
name: flutter_parsed_text
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.1"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.6"
flutter_rust_bridge:
dependency: "direct main"
description:
name: flutter_rust_bridge
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.30.0"
+ version: "1.32.0"
flutter_smart_dialog:
dependency: "direct main"
description:
name: flutter_smart_dialog
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "4.3.1"
flutter_test:
@@ -258,238 +293,238 @@ packages:
dependency: "direct main"
description:
name: http
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.13.4"
http_parser:
dependency: transitive
description:
name: http_parser
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "4.0.1"
image:
dependency: "direct main"
description:
name: image
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "3.1.3"
+ version: "3.2.0"
image_picker:
dependency: "direct main"
description:
name: image_picker
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.8.5+3"
image_picker_android:
dependency: transitive
description:
name: image_picker_android
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.8.4+13"
image_picker_for_web:
dependency: transitive
description:
name: image_picker_for_web
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.8"
image_picker_ios:
dependency: transitive
description:
name: image_picker_ios
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.8.5+5"
image_picker_platform_interface:
dependency: transitive
description:
name: image_picker_platform_interface
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.5.0"
intl:
dependency: transitive
description:
name: intl
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.17.0"
js:
dependency: transitive
description:
name: js
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.4"
matcher:
dependency: transitive
description:
name: matcher
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.1.4"
meta:
dependency: transitive
description:
name: meta
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.7.0"
nested:
dependency: transitive
description:
name: nested
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.0"
package_info_plus:
dependency: "direct main"
description:
name: package_info_plus
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.4.2"
package_info_plus_linux:
dependency: transitive
description:
name: package_info_plus_linux
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.5"
package_info_plus_macos:
dependency: transitive
description:
name: package_info_plus_macos
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.0"
package_info_plus_platform_interface:
dependency: transitive
description:
name: package_info_plus_platform_interface
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.2"
package_info_plus_web:
dependency: transitive
description:
name: package_info_plus_web
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.5"
package_info_plus_windows:
dependency: transitive
description:
name: package_info_plus_windows
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.5"
path:
dependency: transitive
description:
name: path
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.8.1"
path_provider:
dependency: "direct main"
description:
name: path_provider
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.10"
path_provider_android:
dependency: transitive
description:
name: path_provider_android
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.14"
path_provider_ios:
dependency: transitive
description:
name: path_provider_ios
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.9"
path_provider_linux:
dependency: transitive
description:
name: path_provider_linux
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "2.1.6"
+ version: "2.1.7"
path_provider_macos:
dependency: transitive
description:
name: path_provider_macos
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.6"
path_provider_platform_interface:
dependency: transitive
description:
name: path_provider_platform_interface
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.4"
path_provider_windows:
dependency: transitive
description:
name: path_provider_windows
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "2.0.6"
+ version: "2.0.7"
pedantic:
dependency: transitive
description:
name: pedantic
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.11.1"
petitparser:
dependency: transitive
description:
name: petitparser
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "4.4.0"
+ version: "5.0.0"
platform:
dependency: transitive
description:
name: platform
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "3.1.0"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.2"
process:
dependency: transitive
description:
name: process
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "4.2.4"
provider:
dependency: "direct main"
description:
name: provider
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "5.0.0"
qr_code_scanner:
@@ -505,70 +540,70 @@ packages:
dependency: transitive
description:
name: quiver
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "3.1.0"
settings_ui:
dependency: "direct main"
description:
name: settings_ui
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.2"
shared_preferences:
dependency: "direct main"
description:
name: shared_preferences
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.15"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.12"
shared_preferences_ios:
dependency: transitive
description:
name: shared_preferences_ios
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.1"
shared_preferences_linux:
dependency: transitive
description:
name: shared_preferences_linux
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.1"
shared_preferences_macos:
dependency: transitive
description:
name: shared_preferences_macos
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.4"
shared_preferences_platform_interface:
dependency: transitive
description:
name: shared_preferences_platform_interface
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
shared_preferences_web:
dependency: transitive
description:
name: shared_preferences_web
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.4"
shared_preferences_windows:
dependency: transitive
description:
name: shared_preferences_windows
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.1"
sky_engine:
@@ -580,219 +615,219 @@ packages:
dependency: transitive
description:
name: source_span
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.8.2"
stack_trace:
dependency: transitive
description:
name: stack_trace
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.10.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.0"
string_scanner:
dependency: transitive
description:
name: string_scanner
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.2.0"
test_api:
dependency: transitive
description:
name: test_api
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.4.9"
toggle_switch:
dependency: "direct main"
description:
name: toggle_switch
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "1.4.0"
transparent_image:
dependency: transitive
description:
name: transparent_image
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
tuple:
dependency: "direct main"
description:
name: tuple
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
typed_data:
dependency: transitive
description:
name: typed_data
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.3.0"
+ version: "1.3.1"
url_launcher:
dependency: "direct main"
description:
name: url_launcher
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "6.1.2"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "6.0.17"
url_launcher_ios:
dependency: transitive
description:
name: url_launcher_ios
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "6.0.17"
url_launcher_linux:
dependency: transitive
description:
name: url_launcher_linux
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.1"
url_launcher_macos:
dependency: transitive
description:
name: url_launcher_macos
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.1"
url_launcher_platform_interface:
dependency: transitive
description:
name: url_launcher_platform_interface
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.5"
url_launcher_web:
dependency: transitive
description:
name: url_launcher_web
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.11"
url_launcher_windows:
dependency: transitive
description:
name: url_launcher_windows
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.1"
uuid:
dependency: transitive
description:
name: uuid
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.6"
vector_math:
dependency: transitive
description:
name: vector_math
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.2"
wakelock:
dependency: "direct main"
description:
name: wakelock
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.5.6"
wakelock_macos:
dependency: transitive
description:
name: wakelock_macos
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.4.0"
wakelock_platform_interface:
dependency: transitive
description:
name: wakelock_platform_interface
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.3.0"
wakelock_web:
dependency: transitive
description:
name: wakelock_web
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.4.0"
wakelock_windows:
dependency: transitive
description:
name: wakelock_windows
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.0"
win32:
dependency: transitive
description:
name: win32
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "2.5.2"
+ version: "2.6.1"
window_manager:
dependency: "direct main"
description:
name: window_manager
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.3"
xdg_directories:
dependency: transitive
description:
name: xdg_directories
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.0+1"
xml:
dependency: transitive
description:
name: xml
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
- version: "5.3.1"
+ version: "6.1.0"
yaml:
dependency: transitive
description:
name: yaml
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "3.1.1"
zxing2:
dependency: "direct main"
description:
name: zxing2
- url: "https://pub.dartlang.org"
+ url: "https://pub.flutter-io.cn"
source: hosted
version: "0.1.0"
sdks:
- dart: ">=2.17.0-0 <3.0.0"
+ dart: ">=2.17.0 <3.0.0"
flutter: ">=3.0.0"
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index 75ad90be9..e74b7fd02 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -57,6 +57,7 @@ dependencies:
flutter_rust_bridge: ^1.30.0
window_manager: ^0.2.3
desktop_multi_window: ^0.0.2
+ bitsdojo_window: ^0.1.2
dev_dependencies:
flutter_launcher_icons: ^0.9.1
diff --git a/flutter/windows/runner/main.cpp b/flutter/windows/runner/main.cpp
index bbc7d344b..a32464559 100644
--- a/flutter/windows/runner/main.cpp
+++ b/flutter/windows/runner/main.cpp
@@ -4,7 +4,9 @@
#include "flutter_window.h"
#include "utils.h"
+#include <bitsdojo_window_windows/bitsdojo_window_plugin.h>
+auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP);
int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
_In_ wchar_t *command_line, _In_ int show_command) {
// Attach to console when present (e.g., 'flutter run') or create a