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)]

69
src/widget/responsive_menu_bar.rs
View file

@ -7,20 +7,62 @@ use crate::{
widget::{button, icon, responsive_container}, widget::{button, icon, responsive_container},
}; };
use super::menu; use super::menu::{self, ItemHeight, ItemWidth};
pub fn responsive_menu_bar() -> ResponsiveMenuBar {
ResponsiveMenuBar::default()
}
pub struct ResponsiveMenuBar {
item_width: ItemWidth,
item_height: ItemHeight,
spacing: f32,
}
impl Default for ResponsiveMenuBar {
fn default() -> ResponsiveMenuBar {
ResponsiveMenuBar {
item_width: ItemWidth::Uniform(150),
item_height: ItemHeight::Uniform(30),
spacing: 0.,
}
}
}
impl ResponsiveMenuBar {
/// Set the item width
pub fn item_width(mut self, item_width: ItemWidth) -> Self {
self.item_width = item_width;
self
}
/// Set the item height
pub fn item_height(mut self, item_height: ItemHeight) -> Self {
self.item_height = item_height;
self
}
/// Set the spacing
pub fn spacing(mut self, spacing: f32) -> Self {
self.spacing = spacing;
self
}
/// # Panics /// # Panics
/// ///
/// Will panic if the menu bar collapses without tracking the size /// 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>>( pub fn into_element<
'a,
Message: Clone + 'static,
A: menu::Action<Message = Message>,
S: Into<std::borrow::Cow<'static, str>> + 'static,
>(
self,
core: &Core, core: &Core,
key_binds: &HashMap<menu::KeyBind, A>, key_binds: &HashMap<menu::KeyBind, A>,
id: crate::widget::Id, id: crate::widget::Id,
action_message: impl Fn(crate::surface::Action) -> Message + 'static, action_message: impl Fn(crate::surface::Action) -> Message + 'static,
trees: Vec<( trees: Vec<(S, Vec<menu::Item<A, S>>)>,
std::borrow::Cow<'static, str>,
Vec<menu::Item<A, std::borrow::Cow<'static, str>>>,
)>,
) -> Element<'a, Message> { ) -> Element<'a, Message> {
use crate::widget::id_container; use crate::widget::id_container;
@ -39,11 +81,14 @@ pub fn responsive_menu_bar<'a, Message: Clone + 'static, A: menu::Action<Message
.map(|mt| { .map(|mt| {
menu::Tree::<_>::with_children( menu::Tree::<_>::with_children(
menu::root(mt.0), menu::root(mt.0),
menu::items(key_binds, mt.1), menu::items(key_binds, mt.1.into()),
) )
}) })
.collect(), .collect(),
), )
.item_width(self.item_width)
.item_height(self.item_height)
.spacing(self.spacing),
crate::widget::Id::new(format!("menu_bar_expanded_{id}")), crate::widget::Id::new(format!("menu_bar_expanded_{id}")),
), ),
id, id,
@ -63,10 +108,13 @@ pub fn responsive_menu_bar<'a, Message: Clone + 'static, A: menu::Action<Message
key_binds, key_binds,
trees trees
.into_iter() .into_iter()
.map(|mt| menu::Item::Folder(mt.0, mt.1)) .map(|mt| menu::Item::Folder(mt.0, mt.1.into()))
.collect(), .collect(),
), ),
)]), )])
.item_height(self.item_height)
.item_width(self.item_width)
.spacing(self.spacing),
crate::widget::Id::new(format!("menu_bar_collapsed_{id}")), crate::widget::Id::new(format!("menu_bar_collapsed_{id}")),
), ),
id, id,
@ -76,3 +124,4 @@ pub fn responsive_menu_bar<'a, Message: Clone + 'static, A: menu::Action<Message
.apply(Element::from) .apply(Element::from)
} }
} }
}