pogmommy/worf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add allow building menu only after signal

Browse source
This commit is contained in:
Alexander Mohr 2025-05-14 22:01:49 +02:00
parent fbff13752c
commit 6632f2f123
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
worf/src/lib/gui.rs
View file

@ -2,10 +2,11 @@ use std::collections::HashMap;
use std::rc::Rc; use std::rc::Rc;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::thread; use std::thread;
use std::time::Instant; use std::time::{Duration, Instant};
use crossbeam::channel; use crossbeam::channel;
use crossbeam::channel::Sender; use crossbeam::channel::Sender;
use crossbeam::channel::internal::SelectHandle;
use gdk4::Display; use gdk4::Display;
use gdk4::gio::File; use gdk4::gio::File;
use gdk4::glib::{MainContext, Propagation}; use gdk4::glib::{MainContext, Propagation};
@ -565,16 +566,19 @@ fn build_ui<T, P>(
let (_changed, provider_elements) = get_provider_elements.join().unwrap(); let (_changed, provider_elements) = get_provider_elements.join().unwrap();
log::debug!("got items after {:?}", wait_for_items.elapsed()); log::debug!("got items after {:?}", wait_for_items.elapsed());
let animate_cfg = config.clone(); let animate_cfg = config.clone();
let animate_window = ui_elements.window.clone(); let animate_window = ui_elements.window.clone();
let (sender, receiver) = channel::bounded(1);
animate_window.connect_is_active_notify(move |w| { animate_window.connect_is_active_notify(move |w| {
w.set_opacity(1.0); w.set_opacity(1.0);
window_show_resize(&animate_cfg.clone(), w); window_show_resize(&animate_cfg.clone(), w);
if let Err(e) = sender.send(()) {
log::debug!("cannot unblock menu builder {e:?}");
}
}); });
build_ui_from_menu_items(&ui_elements, &meta, provider_elements); build_ui_from_menu_items(&ui_elements, &meta, provider_elements, Some(receiver));
// hide the fact that we are starting with a small window // hide the fact that we are starting with a small window
ui_elements.window.set_opacity(0.01); ui_elements.window.set_opacity(0.01);
@ -681,6 +685,7 @@ fn build_ui_from_menu_items<T: Clone + 'static + Send>(
ui: &Rc<UiElements<T>>, ui: &Rc<UiElements<T>>,
meta: &Rc<MetaData<T>>, meta: &Rc<MetaData<T>>,
mut items: Vec<MenuItem<T>>, mut items: Vec<MenuItem<T>>,
wait_for_signal: Option<channel::Receiver<()>>,
) { ) {
let start = Instant::now(); let start = Instant::now();
{ {
@ -694,12 +699,18 @@ fn build_ui_from_menu_items<T: Clone + 'static + Send>(
let ui_clone = Rc::<UiElements<T>>::clone(ui); let ui_clone = Rc::<UiElements<T>>::clone(ui);
glib::idle_add_local(move || { glib::idle_add_local(move || {
if let Some(wait) = &wait_for_signal {
if !wait.is_ready() {
return ControlFlow::Continue;
}
}
ui_clone.main_box.unset_sort_func(); ui_clone.main_box.unset_sort_func();
let mut done = false; let mut done = false;
{ {
let mut lock = ui_clone.menu_rows.lock().unwrap(); let mut lock = ui_clone.menu_rows.lock().unwrap();
for _ in 0..100 { for _ in 0..25 {
if let Some(item) = items.pop() { if let Some(item) = items.pop() {
lock.insert(add_menu_item(&ui_clone, &meta_clone, &item), item); lock.insert(add_menu_item(&ui_clone, &meta_clone, &item), item);
} else { } else {
@ -786,7 +797,7 @@ fn handle_key_press<T: Clone + 'static + Send>(
let update_view_from_provider = |query: &String| { let update_view_from_provider = |query: &String| {
let (changed, filtered_list) = meta.item_provider.lock().unwrap().get_elements(Some(query)); let (changed, filtered_list) = meta.item_provider.lock().unwrap().get_elements(Some(query));
if changed { if changed {
build_ui_from_menu_items(ui, meta, filtered_list); build_ui_from_menu_items(ui, meta, filtered_list, None);
} }
update_view(query); update_view(query);
}; };
@ -863,7 +874,7 @@ fn handle_key_press<T: Clone + 'static + Send>(
if let Some(changed) = opt_changed { if let Some(changed) = opt_changed {
let items = changed.0.1.unwrap_or_default(); let items = changed.0.1.unwrap_or_default();
if changed.0.0 { if changed.0.0 {
build_ui_from_menu_items(ui, meta, items); build_ui_from_menu_items(ui, meta, items, None);
} }
let query = changed.1; let query = changed.1;