From fbda6a4f076043e7fa01d662bd546687d5b9c6d0 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 21 Dec 2022 10:04:56 -0700 Subject: [PATCH] Titles on unimplemented pages, fix nav bar padding --- examples/cosmic/src/window.rs | 12 ++++++++---- src/widget/navigation/macros.rs | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/examples/cosmic/src/window.rs b/examples/cosmic/src/window.rs index e9efdb5..73c5f83 100644 --- a/examples/cosmic/src/window.rs +++ b/examples/cosmic/src/window.rs @@ -167,7 +167,7 @@ impl Window { ); settings::view_column(vec![ - text("Demo").size(32).into(), + text("Demo").size(30).into(), settings::view_section("Debug") .add(settings::item("Debug theme", choose_theme)) .add(settings::item( @@ -316,7 +316,7 @@ impl Window { .padding(0) .style(theme::Button::Link) .on_press(Message::Page(Page::Desktop(DesktopPage::Root))), - text("Desktop Options").size(32), + text("Desktop Options").size(30), ) .spacing(10) .into(), @@ -460,7 +460,7 @@ impl Application for Window { sidebar_button(Page::Applications, "preferences-desktop-apps-symbolic"), ).spacing(14))) .height(Length::Fill) - .padding(11) + .padding(8) .style(theme::Container::Custom(nav_bar::nav_bar_sections_style)); if ! condensed { @@ -477,7 +477,11 @@ impl Application for Window { Page::Desktop(DesktopPage::Root) => self.view_desktop_root(), Page::Desktop(DesktopPage::DesktopOptions) => self.view_desktop_options(), _ => 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(), }; diff --git a/src/widget/navigation/macros.rs b/src/widget/navigation/macros.rs index 3e90c35..fe14fef 100644 --- a/src/widget/navigation/macros.rs +++ b/src/widget/navigation/macros.rs @@ -20,7 +20,8 @@ pub mod nav_bar { .vertical_alignment($crate::iced::alignment::Vertical::Center), $crate::iced::widget::horizontal_space($crate::iced::Length::Fill), ) - .padding([4, 16]) + // Adjusted down due to border radius? + .padding([5, 11]) .spacing(8) ) .style(if $active {