From b80eb2dc6ccc5679e361f22622d52bcf49b652b7 Mon Sep 17 00:00:00 2001 From: fufesou <13586388+fufesou@users.noreply.github.com> Date: Mon, 22 Dec 2025 17:10:53 +0800 Subject: [PATCH] refact: remote toolbar icon (#13865) Signed-off-by: fufesou --- flutter/assets/keyboard.svg | 1 - flutter/assets/keyboard_mouse.svg | 1 + .../lib/desktop/widgets/remote_toolbar.dart | 20 ++++++++++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) delete mode 100644 flutter/assets/keyboard.svg create mode 100644 flutter/assets/keyboard_mouse.svg diff --git a/flutter/assets/keyboard.svg b/flutter/assets/keyboard.svg deleted file mode 100644 index 0e94a5a62..000000000 --- a/flutter/assets/keyboard.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/flutter/assets/keyboard_mouse.svg b/flutter/assets/keyboard_mouse.svg new file mode 100644 index 000000000..f6a5b4b2b --- /dev/null +++ b/flutter/assets/keyboard_mouse.svg @@ -0,0 +1 @@ + diff --git a/flutter/lib/desktop/widgets/remote_toolbar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart index 06675f9ec..8146e0d6f 100644 --- a/flutter/lib/desktop/widgets/remote_toolbar.dart +++ b/flutter/lib/desktop/widgets/remote_toolbar.dart @@ -1765,13 +1765,23 @@ class _KeyboardMenu extends StatelessWidget { Widget build(BuildContext context) { var ffiModel = Provider.of(context); if (!ffiModel.keyboard) return Offstage(); - toolbarToggles() => toolbarKeyboardToggles(ffi) - .map((e) => CkbMenuButton( - value: e.value, onChanged: e.onChanged, child: e.child, ffi: ffi)) - .toList(); + toolbarToggles() { + final toggles = toolbarKeyboardToggles(ffi) + .map((e) => CkbMenuButton( + value: e.value, + onChanged: e.onChanged, + child: e.child, + ffi: ffi) as Widget) + .toList(); + if (toggles.isNotEmpty) { + toggles.add(Divider()); + } + return toggles; + } + return _IconSubmenuButton( tooltip: 'Keyboard Settings', - svg: "assets/keyboard.svg", + svg: "assets/keyboard_mouse.svg", ffi: ffi, color: _ToolbarTheme.blueColor, hoverColor: _ToolbarTheme.hoverBlueColor,