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

Use more menu theming from libcosmic

Browse source
This commit is contained in:
Jeremy Soller 2023-10-26 11:25:14 -06:00
parent 49dcb4a84e
commit a472b47ee3
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
4 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main.rs
View file

@ -3,10 +3,7 @@
use cosmic::{
app::{message, Command, Core, Settings},
executor,
iced::{
widget::{column, text},
Length, Limits,
},
iced::{widget::text, Length, Limits},
widget::{self, icon, segmented_button, view_switcher},
ApplicationExt, Element,
};
@ -230,9 +227,11 @@ impl cosmic::Application for App {
Command::none()
}
fn view(&self) -> Element<Message> {
let menu_bar = menu_bar();
fn header_start(&self) -> Vec<Element<Message>> {
vec![menu_bar()]
}
fn view(&self) -> Element<Message> {
let mut tab_column = widget::column::with_capacity(3).padding([0, 16]);
tab_column = tab_column.push(
@ -287,7 +286,7 @@ impl cosmic::Application for App {
}
project_row = project_row.push(tab_column);
let content: Element<_> = column![menu_bar, project_row].into();
let content: Element<_> = project_row.into();
// Uncomment to debug layout:
//content.explain(cosmic::iced::Color::WHITE)

18
src/menu.rs
View file

@ -5,9 +5,8 @@ use cosmic::{
iced::{widget::horizontal_rule, Alignment, Length},
theme,
widget::{
self, button, horizontal_space,
self, horizontal_space,
menu::{ItemHeight, ItemWidth, MenuBar, MenuTree},
text,
},
Element,
};
@ -17,14 +16,14 @@ use crate::Message;
pub fn menu_bar<'a>() -> Element<'a, Message> {
//TODO: port to libcosmic
let menu_root = |label| {
button(label)
widget::button(label)
.padding([4, 12])
.style(theme::Button::MenuRoot)
};
macro_rules! menu_button {
($($x:expr),+ $(,)?) => (
button(
widget::button(
widget::Row::with_children(
vec![$(Element::from($x)),+]
)
@ -37,14 +36,12 @@ pub fn menu_bar<'a>() -> Element<'a, Message> {
);
}
let menu_folder = |label| menu_button!(text(label), horizontal_space(Length::Fill), text(">"));
let menu_folder = |label| menu_button!(label, horizontal_space(Length::Fill), ">");
let menu_item = |label, message| MenuTree::new(menu_button!(text(label)).on_press(message));
let menu_item = |label, message| MenuTree::new(menu_button!(label).on_press(message));
let menu_key = |label, key, message| {
MenuTree::new(
menu_button!(text(label), horizontal_space(Length::Fill), text(key)).on_press(message),
)
MenuTree::new(menu_button!(label, horizontal_space(Length::Fill), key).on_press(message))
};
MenuBar::new(vec![
@ -120,11 +117,8 @@ pub fn menu_bar<'a>() -> Element<'a, Message> {
],
),
])
.cross_offset(0)
.item_height(ItemHeight::Dynamic(40))
.item_width(ItemWidth::Uniform(240))
.main_offset(0)
.padding(8)
.spacing(4.0)
.into()
}