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

Titles on unimplemented pages, fix nav bar padding

Browse source
This commit is contained in:
Jeremy Soller 2022-12-21 10:04:56 -07:00
parent ba866da4a6
commit fbda6a4f07
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
examples/cosmic/src/window.rs
View file

@ -167,7 +167,7 @@ impl Window {
); );
settings::view_column(vec![ settings::view_column(vec![
text("Demo").size(32).into(), text("Demo").size(30).into(),
settings::view_section("Debug") settings::view_section("Debug")
.add(settings::item("Debug theme", choose_theme)) .add(settings::item("Debug theme", choose_theme))
.add(settings::item( .add(settings::item(
@ -316,7 +316,7 @@ impl Window {
.padding(0) .padding(0)
.style(theme::Button::Link) .style(theme::Button::Link)
.on_press(Message::Page(Page::Desktop(DesktopPage::Root))), .on_press(Message::Page(Page::Desktop(DesktopPage::Root))),
text("Desktop Options").size(32), text("Desktop Options").size(30),
) )
.spacing(10) .spacing(10)
.into(), .into(),
@ -460,7 +460,7 @@ impl Application for Window {
sidebar_button(Page::Applications, "preferences-desktop-apps-symbolic"), sidebar_button(Page::Applications, "preferences-desktop-apps-symbolic"),
).spacing(14))) ).spacing(14)))
.height(Length::Fill) .height(Length::Fill)
.padding(11) .padding(8)
.style(theme::Container::Custom(nav_bar::nav_bar_sections_style)); .style(theme::Container::Custom(nav_bar::nav_bar_sections_style));
if ! condensed { if ! condensed {
@ -477,7 +477,11 @@ impl Application for Window {
Page::Desktop(DesktopPage::Root) => self.view_desktop_root(), Page::Desktop(DesktopPage::Root) => self.view_desktop_root(),
Page::Desktop(DesktopPage::DesktopOptions) => self.view_desktop_options(), Page::Desktop(DesktopPage::DesktopOptions) => self.view_desktop_options(),
_ => settings::view_column(vec![ _ => settings::view_column(vec![
text("Unimplemented page").into() row!(
text(self.page.title()).size(30),
horizontal_space(Length::Fill),
).into(),
text("Unimplemented page").into(),
]).into(), ]).into(),
}; };

3
src/widget/navigation/macros.rs
View file

@ -20,7 +20,8 @@ pub mod nav_bar {
.vertical_alignment($crate::iced::alignment::Vertical::Center), .vertical_alignment($crate::iced::alignment::Vertical::Center),
$crate::iced::widget::horizontal_space($crate::iced::Length::Fill), $crate::iced::widget::horizontal_space($crate::iced::Length::Fill),
) )
.padding([4, 16]) // Adjusted down due to border radius?
.padding([5, 11])
.spacing(8) .spacing(8)
) )
.style(if $active { .style(if $active {