add constructor for menu item
This commit is contained in:
Alexander Mohr
parent
1525803ccc
commit
b18a44fd47
2 changed files with 84 additions and 88 deletions
|
|
@ -84,12 +84,37 @@ pub struct MenuItem<T: Clone> {
|
|||
pub action: Option<String>,
|
||||
pub sub_elements: Vec<MenuItem<T>>,
|
||||
pub working_dir: Option<String>,
|
||||
pub initial_sort_score: i64, // todo make this f64
|
||||
pub search_sort_score: f64, // todo make this private
|
||||
pub visible: bool, // todo make this private
|
||||
pub initial_sort_score: f64,
|
||||
|
||||
/// Allows to store arbitrary additional information
|
||||
pub data: Option<T>,
|
||||
|
||||
search_sort_score: f64,
|
||||
visible: bool,
|
||||
}
|
||||
|
||||
impl<T: Clone> MenuItem<T> {
|
||||
pub fn new(
|
||||
label: String,
|
||||
icon_path: Option<String>,
|
||||
action: Option<String>,
|
||||
sub_elements: Vec<MenuItem<T>>,
|
||||
working_dir: Option<String>,
|
||||
initial_sort_score: f64,
|
||||
data: Option<T>,
|
||||
) -> Self {
|
||||
MenuItem {
|
||||
label,
|
||||
icon_path,
|
||||
action,
|
||||
sub_elements,
|
||||
working_dir,
|
||||
initial_sort_score,
|
||||
data,
|
||||
search_sort_score: 0.0,
|
||||
visible: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: Clone> AsRef<MenuItem<T>> for MenuItem<T> {
|
||||
|
|
@ -671,7 +696,7 @@ where
|
|||
action: None,
|
||||
sub_elements: Vec::new(),
|
||||
working_dir: None,
|
||||
initial_sort_score: 0,
|
||||
initial_sort_score: 0.0,
|
||||
search_sort_score: 0.0,
|
||||
data: None,
|
||||
visible: true,
|
||||
|
|
@ -776,9 +801,9 @@ fn create_menu_row<T: Clone + 'static>(
|
|||
row.set_halign(Align::Fill);
|
||||
row.set_widget_name("row");
|
||||
|
||||
let config_clone = config.clone();
|
||||
let click = GestureClick::new();
|
||||
click.set_button(gdk::BUTTON_PRIMARY);
|
||||
let config_clone = config.clone();
|
||||
click.connect_pressed(move |_gesture, n_press, _x, _y| {
|
||||
if n_press == 2 {
|
||||
if let Err(e) = handle_selected_item(
|
||||
|
|
@ -795,7 +820,6 @@ fn create_menu_row<T: Clone + 'static>(
|
|||
}
|
||||
}
|
||||
});
|
||||
|
||||
row.add_controller(click);
|
||||
|
||||
let row_box = gtk4::Box::new(
|
||||
|
|
@ -880,8 +904,7 @@ fn set_menu_visibility_for_search<T: Clone>(
|
|||
{
|
||||
if query.is_empty() {
|
||||
for menu_item in items.iter_mut() {
|
||||
// todo make initial score and search score both follow same logic.
|
||||
menu_item.search_sort_score = menu_item.initial_sort_score as f64;
|
||||
menu_item.search_sort_score = menu_item.initial_sort_score;
|
||||
menu_item.visible = true;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -936,9 +959,7 @@ fn set_menu_visibility_for_search<T: Clone>(
|
|||
}
|
||||
};
|
||||
|
||||
// todo turn initial score init f64
|
||||
menu_item.search_sort_score =
|
||||
search_sort_score + menu_item.initial_sort_score as f64;
|
||||
menu_item.search_sort_score = search_sort_score + menu_item.initial_sort_score;
|
||||
menu_item.visible = visible;
|
||||
}
|
||||
}
|
||||
|
|
@ -979,17 +1000,15 @@ fn percent_or_absolute(value: Option<&String>, base_value: i32) -> Option<i32> {
|
|||
|
||||
// highly unlikely that we are dealing with > i64 items
|
||||
#[allow(clippy::cast_possible_wrap)]
|
||||
pub fn sort_menu_items_alphabetically_honor_initial_score<T: std::clone::Clone>(
|
||||
items: &mut [MenuItem<T>],
|
||||
) {
|
||||
let special_score = items.len() as i64;
|
||||
let mut regular_score = 0;
|
||||
pub fn sort_menu_items_alphabetically_honor_initial_score<T: Clone>(items: &mut [MenuItem<T>]) {
|
||||
let special_score = items.len() as f64;
|
||||
let mut regular_score = 0.0;
|
||||
items.sort_by(|l, r| l.label.cmp(&r.label));
|
||||
|
||||
for item in items.iter_mut() {
|
||||
if item.initial_sort_score == 0 {
|
||||
if item.initial_sort_score == 0.0 {
|
||||
item.initial_sort_score += regular_score;
|
||||
regular_score += 1;
|
||||
regular_score += 1.0;
|
||||
} else {
|
||||
item.initial_sort_score += special_score;
|
||||
}
|
||||
|
|
|
|||
117
src/lib/mode.rs
117
src/lib/mode.rs
|
|
@ -108,19 +108,17 @@ impl<T: Clone + std::marker::Send + std::marker::Sync> DRunProvider<T> {
|
|||
.map(|s| s.content.clone())
|
||||
.or(Some(default_icon.clone()));
|
||||
|
||||
let sort_score = *self.cache.get(&name).unwrap_or(&0);
|
||||
let sort_score = *self.cache.get(&name).unwrap_or(&0) as f64;
|
||||
|
||||
let mut entry = MenuItem {
|
||||
label: name.clone(),
|
||||
icon_path: icon.clone(),
|
||||
action: action.clone(),
|
||||
sub_elements: Vec::new(),
|
||||
working_dir: working_dir.clone(),
|
||||
initial_sort_score: sort_score,
|
||||
search_sort_score: 0.0,
|
||||
data: Some(self.data.clone()),
|
||||
visible: true,
|
||||
};
|
||||
let mut entry = MenuItem::new(
|
||||
name.clone(),
|
||||
icon.clone(),
|
||||
action.clone(),
|
||||
Vec::new(),
|
||||
working_dir.clone(),
|
||||
sort_score,
|
||||
Some(self.data.clone()),
|
||||
);
|
||||
|
||||
for (_, action) in &file.actions {
|
||||
if let Some(action_name) = lookup_name_with_locale(
|
||||
|
|
@ -136,17 +134,15 @@ impl<T: Clone + std::marker::Send + std::marker::Sync> DRunProvider<T> {
|
|||
.unwrap_or("application-x-executable".to_string());
|
||||
|
||||
|
||||
entry.sub_elements.push(MenuItem {
|
||||
label: action_name,
|
||||
icon_path: Some(action_icon),
|
||||
action: action.exec.clone(),
|
||||
sub_elements: Vec::new(),
|
||||
working_dir: working_dir.clone(),
|
||||
initial_sort_score: 0,
|
||||
search_sort_score: 0.0,
|
||||
data: Some(self.data.clone()),
|
||||
visible: true,
|
||||
});
|
||||
entry.sub_elements.push(MenuItem::new(
|
||||
action_name,
|
||||
Some(action_icon),
|
||||
action.exec.clone(),
|
||||
Vec::new(),
|
||||
working_dir.clone(),
|
||||
0.0,
|
||||
Some(self.data.clone()),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -279,37 +275,31 @@ impl<T: Clone> ItemProvider<T> for FileItemProvider<T> {
|
|||
path_str.push('/');
|
||||
}
|
||||
|
||||
items.push(MenuItem {
|
||||
label: path_str.clone(),
|
||||
icon_path: Some(FileItemProvider::<T>::resolve_icon_for_name(
|
||||
&entry.path(),
|
||||
)),
|
||||
action: Some(format!("xdg-open {path_str}")),
|
||||
sub_elements: vec![],
|
||||
working_dir: None,
|
||||
initial_sort_score: 0,
|
||||
search_sort_score: 0.0,
|
||||
data: Some(self.menu_item_data.clone()),
|
||||
visible: true,
|
||||
});
|
||||
items.push(MenuItem::new(
|
||||
path_str.clone(),
|
||||
Some(FileItemProvider::<T>::resolve_icon_for_name(&entry.path())),
|
||||
Some(format!("xdg-open {path_str}")),
|
||||
vec![],
|
||||
None,
|
||||
0.0,
|
||||
Some(self.menu_item_data.clone()),
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
items.push({
|
||||
MenuItem {
|
||||
label: trimmed_search.clone(),
|
||||
icon_path: Some(FileItemProvider::<T>::resolve_icon_for_name(
|
||||
MenuItem::new(
|
||||
trimmed_search.clone(),
|
||||
Some(FileItemProvider::<T>::resolve_icon_for_name(
|
||||
&PathBuf::from(&trimmed_search),
|
||||
)),
|
||||
action: Some(format!("xdg-open {trimmed_search}")),
|
||||
sub_elements: vec![],
|
||||
working_dir: None,
|
||||
initial_sort_score: 0,
|
||||
search_sort_score: 0.0,
|
||||
data: Some(self.menu_item_data.clone()),
|
||||
visible: true,
|
||||
}
|
||||
Some(format!("xdg-open {trimmed_search}")),
|
||||
vec![],
|
||||
None,
|
||||
0.0,
|
||||
Some(self.menu_item_data.clone()),
|
||||
)
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -356,18 +346,15 @@ impl<T: Clone> ItemProvider<T> for MathProvider<T> {
|
|||
Err(e) => format!("failed to calculate {e:?}"),
|
||||
};
|
||||
|
||||
let item = MenuItem {
|
||||
label: result,
|
||||
icon_path: None,
|
||||
action: search.map(String::from),
|
||||
sub_elements: vec![],
|
||||
working_dir: None,
|
||||
initial_sort_score: 0,
|
||||
search_sort_score: 0.0,
|
||||
data: Some(self.menu_item_data.clone()),
|
||||
visible: true,
|
||||
};
|
||||
|
||||
let item = MenuItem::new(
|
||||
result,
|
||||
None,
|
||||
search.map(String::from),
|
||||
vec![],
|
||||
None,
|
||||
0.0,
|
||||
Some(self.menu_item_data.clone()),
|
||||
);
|
||||
vec![item]
|
||||
} else {
|
||||
vec![]
|
||||
|
|
@ -394,17 +381,7 @@ impl DMenuProvider {
|
|||
let items: Vec<MenuItem<String>> = input
|
||||
.lines()
|
||||
.map(String::from)
|
||||
.map(|s| MenuItem {
|
||||
label: s,
|
||||
icon_path: None,
|
||||
action: None,
|
||||
sub_elements: vec![],
|
||||
working_dir: None,
|
||||
initial_sort_score: 0,
|
||||
search_sort_score: 0.0,
|
||||
data: None,
|
||||
visible: true,
|
||||
})
|
||||
.map(|s| MenuItem::new(s.clone(), None, None, vec![], None, 0.0, None))
|
||||
.collect();
|
||||
|
||||
Ok(Self { items })
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue