leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(menu): update menu declaration.

Browse source 
- Updated libcosmic.
- Updated menu declaration.
This commit is contained in:
Eduardo Flores 2024-03-18 19:31:28 -07:00 • committed by Jeremy Soller
parent 16d3c11816
commit 0ecbb15de3
4 changed files with 68 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

141
src/menu.rs
View file

@ -1,13 +1,14 @@
// SPDX-License-Identifier: GPL-3.0-only
use cosmic::widget::menu::key_bind::KeyBind;
use cosmic::widget::menu::menu_tree::{menu_items, menu_root, MenuItem};
use cosmic::{
//TODO: export in cosmic::widget
iced::{
widget::{column, horizontal_rule, horizontal_space},
Alignment, Background, Length,
},
iced_core::Border,
theme,
menu_button, theme,
widget::{
self,
menu::{ItemHeight, ItemWidth, MenuBar, MenuTree},
@ -17,22 +18,7 @@ use cosmic::{
};
use std::collections::HashMap;
use crate::{fl, Action, ColorSchemeId, ColorSchemeKind, Config, KeyBind, Message};
macro_rules! menu_button {
($($x:expr),+ $(,)?) => (
widget::button(
widget::Row::with_children(
vec![$(Element::from($x)),+]
)
.align_items(Alignment::Center)
)
.height(Length::Fixed(32.0))
.padding([4, 16])
.width(Length::Fill)
.style(theme::Button::MenuItem)
);
}
use crate::{fl, Action, ColorSchemeId, ColorSchemeKind, Config, Message};
pub fn context_menu<'a>(
config: &Config,
@ -145,90 +131,69 @@ pub fn color_scheme_menu<'a>(
}
pub fn menu_bar<'a>(config: &Config, key_binds: &HashMap<KeyBind, Action>) -> Element<'a, Message> {
//TODO: port to libcosmic
let menu_root = |label| {
widget::button(widget::text(label))
.padding([4, 12])
.style(theme::Button::MenuRoot)
};
let menu_folder =
|label| menu_button!(widget::text(label), horizontal_space(Length::Fill), ">");
let find_key = |action: &Action| -> String {
for (key_bind, key_action) in key_binds.iter() {
if action == key_action {
return key_bind.to_string();
}
}
String::new()
};
let menu_item = |label, action| {
let key = find_key(&action);
MenuTree::new(
menu_button!(
widget::text(label),
horizontal_space(Length::Fill),
widget::text(key)
)
.on_press(action.message(None)),
)
};
let mut profile_items = Vec::with_capacity(config.profiles.len());
for (name, id) in config.profile_names() {
profile_items.push(menu_item(name, Action::ProfileOpen(id)));
profile_items.push(MenuItem::Button(name, Action::ProfileOpen(id)));
}
//TODO: what to do if there are no profiles?
MenuBar::new(vec![
MenuTree::with_children(
menu_root(fl!("file")),
vec![
menu_item(fl!("new-tab"), Action::TabNew),
menu_item(fl!("new-window"), Action::WindowNew),
MenuTree::new(horizontal_rule(1)),
MenuTree::with_children(menu_folder(fl!("profile")), profile_items),
menu_item(fl!("menu-profiles"), Action::Profiles),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("close-tab"), Action::TabClose),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("quit"), Action::WindowClose),
],
menu_items(
key_binds,
vec![
MenuItem::Button(fl!("new-tab"), Action::TabNew),
MenuItem::Button(fl!("new-window"), Action::WindowNew),
MenuItem::Divider,
MenuItem::Folder(fl!("profile"), profile_items),
MenuItem::Button(fl!("menu-profiles"), Action::Profiles),
MenuItem::Divider,
MenuItem::Button(fl!("close-tab"), Action::TabClose),
MenuItem::Divider,
MenuItem::Button(fl!("quit"), Action::WindowClose),
],
),
),
MenuTree::with_children(
menu_root(fl!("edit")),
vec![
menu_item(fl!("copy"), Action::Copy),
menu_item(fl!("paste"), Action::Paste),
menu_item(fl!("select-all"), Action::SelectAll),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("find"), Action::Find),
],
menu_items(
key_binds,
vec![
MenuItem::Button(fl!("copy"), Action::Copy),
MenuItem::Button(fl!("paste"), Action::Paste),
MenuItem::Button(fl!("select-all"), Action::SelectAll),
MenuItem::Divider,
MenuItem::Button(fl!("find"), Action::Find),
],
),
),
MenuTree::with_children(
menu_root(fl!("view")),
vec![
menu_item(fl!("zoom-in"), Action::ZoomIn),
menu_item(fl!("zoom-reset"), Action::ZoomReset),
menu_item(fl!("zoom-out"), Action::ZoomOut),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("next-tab"), Action::TabNext),
menu_item(fl!("previous-tab"), Action::TabPrev),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("split-horizontal"), Action::PaneSplitHorizontal),
menu_item(fl!("split-vertical"), Action::PaneSplitVertical),
menu_item(fl!("pane-toggle-maximize"), Action::PaneToggleMaximized),
MenuTree::new(horizontal_rule(1)),
menu_item(
fl!("menu-color-schemes"),
Action::ColorSchemes(config.color_scheme_kind()),
),
menu_item(fl!("menu-settings"), Action::Settings),
MenuTree::new(horizontal_rule(1)),
menu_item(fl!("menu-about"), Action::About),
],
menu_items(
key_binds,
vec![
MenuItem::Button(fl!("zoom-in"), Action::ZoomIn),
MenuItem::Button(fl!("zoom-reset"), Action::ZoomReset),
MenuItem::Button(fl!("zoom-out"), Action::ZoomOut),
MenuItem::Divider,
MenuItem::Button(fl!("next-tab"), Action::TabNext),
MenuItem::Button(fl!("previous-tab"), Action::TabPrev),
MenuItem::Divider,
MenuItem::Button(fl!("split-horizontal"), Action::PaneSplitHorizontal),
MenuItem::Button(fl!("split-vertical"), Action::PaneSplitVertical),
MenuItem::Button(fl!("pane-toggle-maximize"), Action::PaneToggleMaximized),
MenuItem::Divider,
MenuItem::Button(
fl!("menu-color-schemes"),
Action::ColorSchemes(config.color_scheme_kind()),
),
MenuItem::Button(fl!("menu-settings"), Action::Settings),
MenuItem::Divider,
MenuItem::Button(fl!("menu-about"), Action::About),
],
),
),
])
.item_height(ItemHeight::Dynamic(40))