mirrors/gauntlet
1
0
Fork 0
mirror of https://github.com/project-gauntlet/gauntlet.git synced 2025-12-23 10:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add alt+k shortcut for opening action panel

Browse source
This commit is contained in:
Exidex 2024-08-03 17:42:27 +02:00
parent 62fc4cf7b8
commit 70852d0773
4 changed files with 64 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rust/client/src/ui/client_context.rs
View file

@ -74,4 +74,8 @@ impl ClientContext {
UiRenderLocation::View => self.get_view_container().handle_event(plugin_id.clone(), event)
}
}
pub fn show_action_panel(&self) {
self.view.show_action_panel()
}
}

47
rust/client/src/ui/mod.rs
View file

@ -23,7 +23,7 @@ use tokio::sync::RwLock as TokioRwLock;
use tonic::transport::Server;
use client_context::ClientContext;
use common::model::{BackendRequestData, BackendResponseData, EntrypointId, PhysicalShortcut, PluginId, SearchResult, SearchResultEntrypointType, UiRenderLocation, UiRequestData, UiResponseData};
use common::model::{BackendRequestData, BackendResponseData, EntrypointId, PhysicalKey, PhysicalShortcut, PluginId, SearchResult, SearchResultEntrypointType, UiRenderLocation, UiRequestData, UiResponseData};
use common::rpc::backend_api::{BackendApi, BackendForFrontendApi, BackendForFrontendApiError};
use common::scenario_convert::{ui_render_location_from_scenario, ui_widget_from_scenario};
use common::scenario_model::{ScenarioFrontendEvent, ScenarioUiRenderLocation};
@ -490,29 +490,40 @@ impl Application for AppModel {
}
}
} else {
let (plugin_id, entrypoint_id) = {
let client_context = self.client_context.read().expect("lock is poisoned");
(client_context.get_view_plugin_id(), client_context.get_view_entrypoint_id())
};
match physical_key_model(physical_key) {
Some(name) => {
tracing::debug!("physical key pressed: {:?}. shift: {:?} control: {:?} alt: {:?} meta: {:?}", name, modifiers.shift(), modifiers.control(), modifiers.alt(), modifiers.logo());
Command::perform(
async move {
let modifier_shift = modifiers.shift();
let modifier_control = modifiers.control();
let modifier_alt = modifiers.alt();
let modifier_meta = modifiers.logo();
let modifier_shift = modifiers.shift();
let modifier_control = modifiers.control();
let modifier_alt = modifiers.alt();
let modifier_meta = modifiers.logo();
backend_client.send_keyboard_event(plugin_id, entrypoint_id, name, modifier_shift, modifier_control, modifier_alt, modifier_meta)
.await?;
match (&name, modifier_shift, modifier_control, modifier_alt, modifier_meta) {
(PhysicalKey::KeyK, false, false, true, false) => {
let client_context = self.client_context.read().expect("lock is poisoned");
Ok(())
},
|result| handle_backend_error(result, |()| AppMsg::Noop),
)
client_context.show_action_panel();
Command::none()
}
(_, _, _, _, _) => {
let (plugin_id, entrypoint_id) = {
let client_context = self.client_context.read().expect("lock is poisoned");
(client_context.get_view_plugin_id(), client_context.get_view_entrypoint_id())
};
Command::perform(
async move {
backend_client.send_keyboard_event(plugin_id, entrypoint_id, name, modifier_shift, modifier_control, modifier_alt, modifier_meta)
.await?;
Ok(())
},
|result| handle_backend_error(result, |()| AppMsg::Noop),
)
}
}
}
None => {
Command::none()

27
rust/client/src/ui/widget.rs
View file

@ -193,6 +193,33 @@ impl ComponentWidgetWrapper {
.map(|widget| widget.clone())
}
pub fn show_action_panel(&self) {
{
let (_, ref mut state) = &mut *self.get_mut();
match state {
ComponentWidgetState::Detail { show_action_panel } => {
*show_action_panel = !*show_action_panel;
},
ComponentWidgetState::Form { show_action_panel } => {
*show_action_panel = !*show_action_panel;
},
ComponentWidgetState::List { show_action_panel } => {
*show_action_panel = !*show_action_panel;
},
ComponentWidgetState::Grid { show_action_panel } => {
*show_action_panel = !*show_action_panel;
},
_ => {}
};
}
self.get_children()
.unwrap_or(vec![])
.iter()
.for_each(|child| child.show_action_panel());
}
fn get(&self) -> RwLockReadGuard<'_, (ComponentWidget, ComponentWidgetState)> {
self.inner.read().expect("lock is poisoned")
}

4
rust/client/src/ui/widget_container.rs
View file

@ -64,4 +64,8 @@ impl PluginWidgetContainer {
event.handle(plugin_id, widget)
}
pub fn show_action_panel(&self) {
self.root_widget.show_action_panel()
}
}