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

Align navbar with new designs

Browse source
This commit is contained in:
Jeremy Soller 2022-12-19 15:45:43 -07:00 • committed by Michael Murphy
parent a716e0837d
commit 77c13cb732
1 changed files with 91 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -149,76 +149,23 @@ impl Application for Window {
let content = responsive(|size| { let content = responsive(|size| {
let condensed = size.width < 900.0; let condensed = size.width < 900.0;
// cosmic::navbar![ let sidebar: Element<_> = iced::widget::container(
// nav_text_button("network-wireless", "Network & Wireless", condensed) iced::widget::column!(
// .on_press(Message::Page(0)) cosmic::nav_button!("network-wireless-symbolic", "Wi-Fi", condensed, self.page == 0)
// .style(if self.page == 0 { .on_press(Message::Page(0)),
// ButtonTheme::Primary cosmic::nav_button!("network-wired-symbolic", "Networking", condensed, self.page == 1)
// } else { .on_press(Message::Page(1)),
// ButtonTheme::Text cosmic::nav_button!("bluetooth-active-symbolic", "Bluetooth", condensed, self.page == 2)
// }), .on_press(Message::Page(2)),
// nav_text_button("preferences-desktop", "Bluetooth", condensed) cosmic::nav_button!("preferences-desktop-wallpaper-symbolic", "Desktop", condensed, self.page == 3)
// .on_press(Message::Page(1)) .on_press(Message::Page(3)),
// .style(if self.page == 1 { )
// ButtonTheme::Primary .spacing(14)
// } else { )
// ButtonTheme::Text .height(Length::Fill)
// }), .padding(11)
// nav_text_button("system-software-update", "Personalization", condensed) .max_width(300)
// .on_press(Message::Page(2)) .style(theme::Container::Custom(cosmic::widget::nav_bar::nav_bar_sections_style))
// .style(if self.page == 2 {
// ButtonTheme::Primary
// } else {
// ButtonTheme::Text
// }),
// ]
let sidebar: Element<_> = nav_bar()
.source(BTreeMap::from([
(
nav_bar_section()
.title("Network & Wireless")
.icon("network-wireless"),
vec![nav_bar_page("Wi-Fi")],
),
(
nav_bar_section().title("Bluetooth").icon("cs-bluetooth"),
vec![nav_bar_page("Devices")],
),
(
nav_bar_section()
.title("Personalization")
.icon("applications-system"),
vec![
nav_bar_page("Desktop Session"),
nav_bar_page("Wallpaper"),
nav_bar_page("Appearance"),
nav_bar_page("Dock & Top Panel"),
nav_bar_page("Workspaces"),
nav_bar_page("Notifications"),
],
),
(
nav_bar_section()
.title("Input Devices")
.icon("input-keyboard"),
vec![nav_bar_page("Keyboard")],
),
(
nav_bar_section().title("Displays").icon("cs-display"),
vec![nav_bar_page("Keyboard")],
),
(
nav_bar_section().title("Power & Battery").icon("battery"),
vec![nav_bar_page("Status")],
),
(
nav_bar_section().title("Sound").icon("sound"),
vec![nav_bar_page("Volume")],
),
]))
.active(self.sidebar_toggled)
.condensed(condensed)
.into(); .into();
let choose_theme = [Theme::Light, Theme::Dark].iter().fold( let choose_theme = [Theme::Light, Theme::Dark].iter().fold(
@ -233,7 +180,8 @@ impl Application for Window {
}, },
); );
let content: Element<_> = settings::view_column(vec![ let content: Element<_> = match self.page {
_ => settings::view_column(vec![
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(
@ -303,7 +251,8 @@ impl Application for Window {
)) ))
.into() .into()
]) ])
.into(); .into(),
};
let mut widgets = Vec::with_capacity(2); let mut widgets = Vec::with_capacity(2);