mirrors/rmenu
2
0
Fork 1
mirror of https://github.com/imgurbot12/rmenu.git synced 2024-11-10 11:33:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: remodel quit to ensure exit on execute

Browse Source
This commit is contained in:
imgurbot12 2024-07-10 22:02:47 -07:00
parent d356558a7d
commit 838398a959
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
rmenu/src/gui/mod.rs
View File

@ -36,7 +36,6 @@ pub fn run(ctx: Context) {
fn gui_main() -> Element {
// build context and signals for state
let ctx = use_context::<Ctx>();
let window = dioxus_desktop::use_window();
let mut search = use_signal(String::new);
let mut position = use_signal(Position::default);
let mut results = use_signal(|| ctx.borrow().all_results());
@ -60,9 +59,10 @@ fn gui_main() -> Element {
});
// declare keyboard handler
let window = dioxus_desktop::use_window();
let key_ctx = use_context::<Ctx>();
let keydown = move |e: KeyboardEvent| {
let context = key_ctx.borrow();
let mut context = key_ctx.borrow_mut();
// suport console key
#[cfg(debug_assertions)]
if e.code() == Code::Backquote {
@ -73,24 +73,26 @@ fn gui_main() -> Element {
let pos = position.with(|p| p.pos);
let index = results.with(|r| r.get(pos).cloned().unwrap_or(0));
// handle events
let quit = context.handle_keybinds(e, index, &mut position);
// handle quit event
if quit {
window.set_visible(false);
spawn(async move {
// wait for window to vanish
let time = std::time::Duration::from_millis(50);
let window = dioxus_desktop::use_window();
while window.is_visible() {
tokio::time::sleep(time).await;
}
// actually close app after it becomes invisible
window.close();
});
}
context.handle_keybinds(e, index, &mut position);
};
// handle quit event
let window = dioxus_desktop::use_window();
let context = ctx.borrow();
if context.quit {
window.set_visible(false);
spawn(async move {
// wait for window to vanish
let time = std::time::Duration::from_millis(50);
let window = dioxus_desktop::use_window();
while window.is_visible() {
tokio::time::sleep(time).await;
}
// actually close app after it becomes invisible
window.close();
});
}
let pattern = context.config.search.restrict.clone();
let maxlength = context.config.search.max_length as i64;
let max_result = context.calc_limit(&position);
@ -213,13 +215,13 @@ fn gui_entry(mut row: Row) -> Element {
row.position.with_mut(|p| p.set(row.search_index, 0));
if single_click && !menu_active {
let pos = row.position.clone();
result_ctx1.borrow().execute(row.entry_index, &pos);
result_ctx1.borrow_mut().execute(row.entry_index, &pos);
}
},
ondoubleclick: move |_| {
if !menu_active {
let pos = row.position.clone();
result_ctx2.borrow().execute(row.entry_index, &pos);
result_ctx2.borrow_mut().execute(row.entry_index, &pos);
}
},
// content
@ -278,12 +280,12 @@ fn gui_entry(mut row: Row) -> Element {
row.position.with_mut(|p| p.set(row.search_index, 0));
if single_click {
let pos = row.position.clone();
ctx.borrow().execute(row.entry_index, &pos);
ctx.borrow_mut().execute(row.entry_index, &pos);
}
},
ondoubleclick: move |_| {
let pos = row.position.clone();
ctx2.borrow().execute(row.entry_index, &pos);
ctx2.borrow_mut().execute(row.entry_index, &pos);
},
// content
div {
@ -331,7 +333,7 @@ fn context_menu(ctx_menu: Signal<ContextMenu>, position: Signal<Position>) -> El
onclick: move |_| {
position.with_mut(|p| p.subpos = idx);
let pos = position.clone();
ctx.borrow().execute(index, &pos);
ctx.borrow_mut().execute(index, &pos);
},
"{name}"
}

11
rmenu/src/gui/state.rs
View File

@ -40,6 +40,7 @@ impl ContextBuilder {
}
pub fn build(self) -> Context {
Context {
quit: false,
threads: self.threads,
num_results: self.entries.len(),
entries: self.entries,
@ -101,6 +102,7 @@ type Pos = Signal<Position>;
/// Contain and Track Search Results
pub struct Context {
pub quit: bool,
pub css: String,
pub theme: String,
pub config: Config,
@ -171,7 +173,7 @@ impl Context {
self.scroll(pos.with(|p| p.pos) + 3);
}
pub fn execute(&self, index: usize, pos: &Pos) {
pub fn execute(&mut self, index: usize, pos: &Pos) {
let entry = self.get_entry(index);
let (pos, subpos) = pos.with(|p| (p.pos, p.subpos));
log::debug!("execute-pos {pos} {subpos}");
@ -181,17 +183,17 @@ impl Context {
log::debug!("execute-entry {entry:?}");
log::debug!("execute-action: {action:?}");
crate::exec::execute(action, self.config.terminal.clone());
self.quit = true;
}
pub fn handle_keybinds(&self, event: KeyboardEvent, index: usize, pos: &mut Pos) -> bool {
pub fn handle_keybinds(&mut self, event: KeyboardEvent, index: usize, pos: &mut Pos) {
let code = event.code();
let modifiers = event.modifiers();
let keybinds = &self.config.keybinds;
if self.matches(&keybinds.exec, &modifiers, &code) {
self.execute(index, pos);
return true;
} else if self.matches(&keybinds.exit, &modifiers, &code) {
return true;
self.quit = true;
} else if self.matches(&keybinds.move_next, &modifiers, &code) {
self.move_next(index, pos);
self.scroll_down(pos);
@ -209,7 +211,6 @@ impl Context {
self.move_up(self.config.jump_dist, pos);
self.scroll_up(pos);
}
false
}
// ** Position Management **