smart-dev
/
Wox
mirror of https://github.com/Wox-launcher/Wox
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor keyboard event handling and action panel logic 

Switched from KeyboardListener to Focus with autofocus for better keyboard event handling across multiple views. Improved action panel behavior by prioritizing default actions, ensuring they appear first in the list.
This commit is contained in:
qianlifeng 2024-07-30 00:21:14 +08:00
parent e9ede3033a
commit 82efa3b791
No known key found for this signature in database
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Wox.UI.Flutter/wox/lib/modules/launcher/wox_launcher_controller.dart
View File

@ -149,8 +149,17 @@ class WoxLauncherController extends GetxController implements WoxLauncherInterfa
} }
void showActionPanel() { void showActionPanel() {
var actions = queryResults[_activeResultIndex.value].actions;
// move default action to the first
final defaultActionIndex = actions.indexWhere((element) => element.isDefault);
if (defaultActionIndex != -1) {
final defaultAction = actions[defaultActionIndex];
actions.removeAt(defaultActionIndex);
actions.insert(0, defaultAction);
}
_activeActionIndex.value = 0; _activeActionIndex.value = 0;
_resultActions.value = queryResults[_activeResultIndex.value].actions; _resultActions.value = actions;
filterResultActions.value = _resultActions; filterResultActions.value = _resultActions;
for (var _ in filterResultActions) { for (var _ in filterResultActions) {
_resultActionItemGlobalKeys.add(GlobalKey()); _resultActionItemGlobalKeys.add(GlobalKey());

7
Wox.UI.Flutter/wox/lib/modules/setting/views/wox_setting_plugin_view.dart
View File

@ -37,8 +37,9 @@ class WoxSettingPluginView extends GetView<WoxSettingController> {
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.only(bottom: 20), padding: const EdgeInsets.only(bottom: 20),
child: KeyboardListener( child: Focus(
focusNode: FocusNode(onKeyEvent: (FocusNode node, KeyEvent event) { autofocus: true,
onKeyEvent: (FocusNode node, KeyEvent event) {
if (event is KeyDownEvent) { if (event is KeyDownEvent) {
switch (event.logicalKey) { switch (event.logicalKey) {
case LogicalKeyboardKey.escape: case LogicalKeyboardKey.escape:
@ -48,7 +49,7 @@ class WoxSettingPluginView extends GetView<WoxSettingController> {
} }
return KeyEventResult.ignored; return KeyEventResult.ignored;
}), },
child: Obx(() { child: Obx(() {
return TextBox( return TextBox(
autofocus: true, autofocus: true,

7
Wox.UI.Flutter/wox/lib/modules/setting/views/wox_setting_theme_view.dart
View File

@ -14,8 +14,9 @@ class WoxSettingThemeView extends GetView<WoxSettingController> {
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.only(bottom: 20), padding: const EdgeInsets.only(bottom: 20),
child: KeyboardListener( child: Focus(
focusNode: FocusNode(onKeyEvent: (FocusNode node, event) { autofocus: true,
onKeyEvent: (FocusNode node, KeyEvent event) {
if (event is KeyDownEvent) { if (event is KeyDownEvent) {
switch (event.logicalKey) { switch (event.logicalKey) {
case LogicalKeyboardKey.escape: case LogicalKeyboardKey.escape:
@ -25,7 +26,7 @@ class WoxSettingThemeView extends GetView<WoxSettingController> {
} }
return KeyEventResult.ignored; return KeyEventResult.ignored;
}), },
child: Obx(() { child: Obx(() {
return TextBox( return TextBox(
autofocus: true, autofocus: true,

7
Wox.UI.Flutter/wox/lib/modules/setting/views/wox_setting_view.dart
View File

@ -15,8 +15,9 @@ class WoxSettingView extends GetView<WoxSettingController> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Obx(() { return Obx(() {
return KeyboardListener( return Focus(
focusNode: FocusNode(onKeyEvent: (FocusNode node, KeyEvent event) { autofocus: true,
onKeyEvent: (FocusNode node, KeyEvent event) {
if (event is KeyDownEvent) { if (event is KeyDownEvent) {
switch (event.logicalKey) { switch (event.logicalKey) {
case LogicalKeyboardKey.escape: case LogicalKeyboardKey.escape:
@ -26,7 +27,7 @@ class WoxSettingView extends GetView<WoxSettingController> {
} }
return KeyEventResult.ignored; return KeyEventResult.ignored;
}), },
child: Scaffold( child: Scaffold(
body: FluentApp( body: FluentApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,