leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: responsive headers should allow some options

Browse source
This commit is contained in:
Ashley Wulber 2025-04-15 09:41:01 -04:00 • committed by Ashley Wulber
parent 99d2478d98
commit bbcd874d9c
4 changed files with 142 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

40
examples/application/src/main.rs
View file

@ -168,8 +168,10 @@ impl cosmic::Application for App {
Message::ToggleHide => { Message::ToggleHide => {
self.hidden = !self.hidden; self.hidden = !self.hidden;
} }
Message::Surface(_) => { Message::Surface(a) => {
// unimplemented!() return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
} }
Message::Hi => { Message::Hi => {
dbg!("hi"); dbg!("hi");
@ -280,49 +282,49 @@ impl cosmic::Application for App {
} }
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
{ {
vec![cosmic::widget::responsive_menu_bar( vec![cosmic::widget::responsive_menu_bar().into_element(
self.core(), self.core(),
&self.keybinds, &self.keybinds,
MENU_ID.clone(), MENU_ID.clone(),
Message::Surface, Message::Surface,
vec![ vec![
( (
"hiiiiiiiiiiiiiiiiiii 1".into(), "hiiiiiiiiiiiiiiiiiii 1",
vec![menu::Item::Button("hi 1".into(), None, Action::Hi)], vec![menu::Item::Button("hi 1", None, Action::Hi)],
), ),
( (
"hiiiiiiiiiiiiiiiiiii 2".into(), "hiiiiiiiiiiiiiiiiiii 2".into(),
vec![ vec![
menu::Item::Button("hi 2".into(), None, Action::Hi), menu::Item::Button("hi 2", None, Action::Hi),
menu::Item::Button("hi 22".into(), None, Action::Hi), menu::Item::Button("hi 22", None, Action::Hi),
], ],
), ),
( (
"hiiiiiiiiiiiiiiiiiii 3".into(), "hiiiiiiiiiiiiiiiiiii 3".into(),
vec![ vec![
menu::Item::Button("hi 3".into(), None, Action::Hi), menu::Item::Button("hi 3", None, Action::Hi),
menu::Item::Button("hi 33".into(), None, Action::Hi), menu::Item::Button("hi 33", None, Action::Hi),
menu::Item::Button("hi 333".into(), None, Action::Hi), menu::Item::Button("hi 333", None, Action::Hi),
], ],
), ),
( (
"hiiiiiiiiiiiiiiiiiii 4".into(), "hiiiiiiiiiiiiiiiiiii 4".into(),
vec![ vec![
menu::Item::Button("hi 4".into(), None, Action::Hi), menu::Item::Button("hi 4", None, Action::Hi),
menu::Item::Button("hi 44".into(), None, Action::Hi), menu::Item::Button("hi 44", None, Action::Hi),
menu::Item::Button("hi 444".into(), None, Action::Hi), menu::Item::Button("hi 444", None, Action::Hi),
menu::Item::Folder( menu::Item::Folder(
"nest 4".into(), "nest 4".into(),
vec![ vec![
menu::Item::Button("hi 4".into(), None, Action::Hi), menu::Item::Button("hi 4", None, Action::Hi),
menu::Item::Button("hi 44".into(), None, Action::Hi), menu::Item::Button("hi 44", None, Action::Hi),
menu::Item::Button("hi 444".into(), None, Action::Hi), menu::Item::Button("hi 444", None, Action::Hi),
menu::Item::Folder( menu::Item::Folder(
"nest 2 4".into(), "nest 2 4".into(),
vec![ vec![
menu::Item::Button("hi 4".into(), None, Action::Hi), menu::Item::Button("hi 4", None, Action::Hi),
menu::Item::Button("hi 44".into(), None, Action::Hi), menu::Item::Button("hi 44", None, Action::Hi),
menu::Item::Button("hi 444".into(), None, Action::Hi), menu::Item::Button("hi 444", None, Action::Hi),
], ],
), ),
], ],

9
src/app/cosmic.rs
View file

@ -61,8 +61,9 @@ where
&mut self, &mut self,
_surface_message: crate::surface::Action, _surface_message: crate::surface::Action,
) -> iced::Task<crate::Action<T::Message>> { ) -> iced::Task<crate::Action<T::Message>> {
#[cfg(feature = "wayland")] #[cfg(feature = "surface-message")]
match _surface_message { match _surface_message {
#[cfg(feature = "wayland")]
crate::surface::Action::AppSubsurface(settings, view) => { crate::surface::Action::AppSubsurface(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings) let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok() .ok()
@ -91,6 +92,7 @@ where
iced_winit::commands::subsurface::get_subsurface(settings(&mut self.app)) iced_winit::commands::subsurface::get_subsurface(settings(&mut self.app))
} }
} }
#[cfg(feature = "wayland")]
crate::surface::Action::Subsurface(settings, view) => { crate::surface::Action::Subsurface(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings) let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok() .ok()
@ -117,6 +119,7 @@ where
iced_winit::commands::subsurface::get_subsurface(settings()) iced_winit::commands::subsurface::get_subsurface(settings())
} }
} }
#[cfg(feature = "wayland")]
crate::surface::Action::AppPopup(settings, view) => { crate::surface::Action::AppPopup(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings) let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok() .ok()
@ -162,6 +165,7 @@ where
core.menu_bars.insert(menu_bar, (limits, size)); core.menu_bars.insert(menu_bar, (limits, size));
iced::Task::none() iced::Task::none()
} }
#[cfg(feature = "wayland")]
crate::surface::Action::Popup(settings, view) => { crate::surface::Action::Popup(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings) let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok() .ok()
@ -192,9 +196,10 @@ where
crate::surface::Action::Task(f) => { crate::surface::Action::Task(f) => {
f().map(|sm| crate::Action::Cosmic(Action::Surface(sm))) f().map(|sm| crate::Action::Cosmic(Action::Surface(sm)))
} }
_ => iced::Task::none(),
} }
#[cfg(not(feature = "wayland"))] #[cfg(not(feature = "surface-message"))]
iced::Task::none() iced::Task::none()
} }

2
src/widget/mod.rs
View file

@ -103,7 +103,7 @@ pub(crate) mod responsive_container;
mod responsive_menu_bar; mod responsive_menu_bar;
#[cfg(feature = "surface-message")] #[cfg(feature = "surface-message")]
#[doc(inline)] #[doc(inline)]
pub use responsive_menu_bar::responsive_menu_bar; pub use responsive_menu_bar::{ResponsiveMenuBar, responsive_menu_bar};
pub mod button; pub mod button;
#[doc(inline)] #[doc(inline)]

177
src/widget/responsive_menu_bar.rs
View file

@ -7,72 +7,121 @@ use crate::{
widget::{button, icon, responsive_container}, widget::{button, icon, responsive_container},
}; };
use super::menu; use super::menu::{self, ItemHeight, ItemWidth};
/// # Panics pub fn responsive_menu_bar() -> ResponsiveMenuBar {
/// ResponsiveMenuBar::default()
/// Will panic if the menu bar collapses without tracking the size }
pub fn responsive_menu_bar<'a, Message: Clone + 'static, A: menu::Action<Message = Message>>(
core: &Core,
key_binds: &HashMap<menu::KeyBind, A>,
id: crate::widget::Id,
action_message: impl Fn(crate::surface::Action) -> Message + 'static,
trees: Vec<(
std::borrow::Cow<'static, str>,
Vec<menu::Item<A, std::borrow::Cow<'static, str>>>,
)>,
) -> Element<'a, Message> {
use crate::widget::id_container;
let menu_bar_size = core.menu_bars.get(&id); pub struct ResponsiveMenuBar {
item_width: ItemWidth,
item_height: ItemHeight,
spacing: f32,
}
#[allow(clippy::if_not_else)] impl Default for ResponsiveMenuBar {
if !menu_bar_size.is_some_and(|(limits, size)| { fn default() -> ResponsiveMenuBar {
let max_size = limits.max(); ResponsiveMenuBar {
max_size.width < size.width item_width: ItemWidth::Uniform(150),
}) { item_height: ItemHeight::Uniform(30),
responsive_container::responsive_container( spacing: 0.,
id_container( }
menu::bar( }
trees }
.into_iter()
.map(|mt| { impl ResponsiveMenuBar {
menu::Tree::<_>::with_children( /// Set the item width
menu::root(mt.0), pub fn item_width(mut self, item_width: ItemWidth) -> Self {
menu::items(key_binds, mt.1), self.item_width = item_width;
) self
}) }
.collect(),
), /// Set the item height
crate::widget::Id::new(format!("menu_bar_expanded_{id}")), pub fn item_height(mut self, item_height: ItemHeight) -> Self {
), self.item_height = item_height;
id, self
action_message, }
)
.apply(Element::from) /// Set the spacing
} else { pub fn spacing(mut self, spacing: f32) -> Self {
responsive_container::responsive_container( self.spacing = spacing;
id_container( self
menu::bar(vec![menu::Tree::<_>::with_children( }
Element::from(
button::icon(icon::from_name("open-menu-symbolic")) /// # Panics
.padding([4, 12]) ///
.class(crate::theme::Button::MenuRoot), /// Will panic if the menu bar collapses without tracking the size
), pub fn into_element<
menu::items( 'a,
key_binds, Message: Clone + 'static,
trees A: menu::Action<Message = Message>,
.into_iter() S: Into<std::borrow::Cow<'static, str>> + 'static,
.map(|mt| menu::Item::Folder(mt.0, mt.1)) >(
.collect(), self,
), core: &Core,
)]), key_binds: &HashMap<menu::KeyBind, A>,
crate::widget::Id::new(format!("menu_bar_collapsed_{id}")), id: crate::widget::Id,
), action_message: impl Fn(crate::surface::Action) -> Message + 'static,
id, trees: Vec<(S, Vec<menu::Item<A, S>>)>,
action_message, ) -> Element<'a, Message> {
) use crate::widget::id_container;
.size(menu_bar_size.unwrap().1)
.apply(Element::from) let menu_bar_size = core.menu_bars.get(&id);
#[allow(clippy::if_not_else)]
if !menu_bar_size.is_some_and(|(limits, size)| {
let max_size = limits.max();
max_size.width < size.width
}) {
responsive_container::responsive_container(
id_container(
menu::bar(
trees
.into_iter()
.map(|mt| {
menu::Tree::<_>::with_children(
menu::root(mt.0),
menu::items(key_binds, mt.1.into()),
)
})
.collect(),
)
.item_width(self.item_width)
.item_height(self.item_height)
.spacing(self.spacing),
crate::widget::Id::new(format!("menu_bar_expanded_{id}")),
),
id,
action_message,
)
.apply(Element::from)
} else {
responsive_container::responsive_container(
id_container(
menu::bar(vec![menu::Tree::<_>::with_children(
Element::from(
button::icon(icon::from_name("open-menu-symbolic"))
.padding([4, 12])
.class(crate::theme::Button::MenuRoot),
),
menu::items(
key_binds,
trees
.into_iter()
.map(|mt| menu::Item::Folder(mt.0, mt.1.into()))
.collect(),
),
)])
.item_height(self.item_height)
.item_width(self.item_width)
.spacing(self.spacing),
crate::widget::Id::new(format!("menu_bar_collapsed_{id}")),
),
id,
action_message,
)
.size(menu_bar_size.unwrap().1)
.apply(Element::from)
}
} }
} }