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

fix(context_drawer): center header elements

Browse source
This commit is contained in:
Vukašin Vojinović 2024-11-08 12:26:03 +01:00 • committed by Michael Murphy
parent 2704a77aa3
commit 707f2115eb
4 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/mod.rs
View file

@ -809,7 +809,7 @@ impl<App: Application> ApplicationExt for App {
}; };
let content_row = crate::widget::row::with_children({ let content_row = crate::widget::row::with_children({
let mut widgets = Vec::with_capacity(4); let mut widgets = Vec::with_capacity(3);
// Insert nav bar onto the left side of the window. // Insert nav bar onto the left side of the window.
let has_nav = if let Some(nav) = self let has_nav = if let Some(nav) = self

6
src/widget/context_drawer/widget.rs
View file

@ -39,6 +39,8 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> {
} = crate::theme::active().cosmic().spacing; } = crate::theme::active().cosmic().spacing;
let header = row::with_capacity(3) let header = row::with_capacity(3)
.width(Length::Fixed(480.0))
.align_y(Alignment::Center)
.padding([space_m, space_l]) .padding([space_m, space_l])
.push(Space::new(Length::FillPortion(1), Length::Fixed(0.0))) .push(Space::new(Length::FillPortion(1), Length::Fixed(0.0)))
.push(text::heading(header).width(Length::FillPortion(1)).center()) .push(text::heading(header).width(Length::FillPortion(1)).center())
@ -49,9 +51,7 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> {
.apply(container) .apply(container)
.width(Length::FillPortion(1)) .width(Length::FillPortion(1))
.align_x(Alignment::End), .align_x(Alignment::End),
) );
// XXX must be done after pushing elements or it may be overwritten by size hints from contents
.width(Length::Fixed(480.0));
let pane = column::with_capacity(2).push(header).push( let pane = column::with_capacity(2).push(header).push(
scrollable(container(drawer.into()).padding([0, space_l, space_l, space_l])) scrollable(container(drawer.into()).padding([0, space_l, space_l, space_l]))

5
src/widget/header_bar.rs
View file

@ -286,7 +286,7 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
}; };
// Creates the headerbar widget. // Creates the headerbar widget.
let mut widget = widget::row::with_capacity(4) let mut widget = widget::row::with_capacity(3)
// If elements exist in the start region, append them here. // If elements exist in the start region, append them here.
.push( .push(
widget::row::with_children(start) widget::row::with_children(start)
@ -351,8 +351,7 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
widget::text::heading(title) widget::text::heading(title)
.apply(widget::container) .apply(widget::container)
.center_x(Length::Fill) .center(Length::Fill)
.center_y(Length::Fill)
.into() .into()
} }

6
src/widget/list/column.rs
View file

@ -41,13 +41,13 @@ impl<'a, Message: 'static> ListColumn<'a, Message> {
} }
// Ensure a minimum height of 32. // Ensure a minimum height of 32.
let container = iced::widget::row![ let list_item = iced::widget::row![
crate::widget::container(item).align_y(iced::Alignment::Center), item.into(),
crate::widget::vertical_space().height(iced::Length::Fixed(32.)) crate::widget::vertical_space().height(iced::Length::Fixed(32.))
] ]
.align_y(iced::Alignment::Center); .align_y(iced::Alignment::Center);
self.children.push(container.into()); self.children.push(list_item.into());
self self
} }