leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use spacing variables

Browse source
This commit is contained in:
Jeremy Soller 2023-11-30 11:02:05 -07:00
parent 1bc908b92f
commit 7d78174ae0
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
1 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/main.rs
View file

@ -591,15 +591,22 @@ impl Application for App {
let nav_model = self.nav_model()?; let nav_model = self.nav_model()?;
let cosmic_theme::Spacing {
space_none,
space_s,
space_xxxs,
..
} = self.core().system_theme().cosmic().spacing;
let mut nav = segmented_button::vertical(nav_model) let mut nav = segmented_button::vertical(nav_model)
.button_height(28) .button_height(space_xxxs + 20 /* line height */ + space_xxxs)
.button_padding([16, 4, 16, 4]) .button_padding([space_s, space_xxxs, space_s, space_xxxs])
.button_spacing(4) .button_spacing(space_xxxs)
.on_activate(|entity| message::cosmic(cosmic::app::cosmic::Message::NavBar(entity))) .on_activate(|entity| message::cosmic(cosmic::app::cosmic::Message::NavBar(entity)))
.spacing(0) .spacing(space_none)
.style(theme::SegmentedButton::ViewSwitcher) .style(theme::SegmentedButton::ViewSwitcher)
.apply(widget::container) .apply(widget::container)
.padding([8, 16]) .padding(space_s)
.width(Length::Fill); .width(Length::Fill);
if !self.core().is_condensed() { if !self.core().is_condensed() {
@ -1148,6 +1155,13 @@ impl Application for App {
return None; return None;
} }
let cosmic_theme::Spacing {
space_none,
space_s,
space_xxs,
..
} = self.core().system_theme().cosmic().spacing;
Some(match self.context_page { Some(match self.context_page {
ContextPage::DocumentStatistics => { ContextPage::DocumentStatistics => {
//TODO: calculate in the background //TODO: calculate in the background
@ -1258,8 +1272,8 @@ impl Application for App {
}; };
widget::column::with_children(items) widget::column::with_children(items)
.spacing(16) .spacing(space_s)
.padding([8, 0]) .padding([space_xxs, space_none])
.into() .into()
} }
ContextPage::Settings => { ContextPage::Settings => {
@ -1348,7 +1362,13 @@ impl Application for App {
} }
fn view(&self) -> Element<Message> { fn view(&self) -> Element<Message> {
let mut tab_column = widget::column::with_capacity(3).padding([0, 8]); let cosmic_theme::Spacing {
space_none,
space_xxs,
..
} = self.core().system_theme().cosmic().spacing;
let mut tab_column = widget::column::with_capacity(3).padding([space_none, space_xxs]);
tab_column = tab_column.push( tab_column = tab_column.push(
row![ row![
@ -1360,7 +1380,7 @@ impl Application for App {
.width(Length::Shrink), .width(Length::Shrink),
button(icon_cache_get("list-add-symbolic", 16)) button(icon_cache_get("list-add-symbolic", 16))
.on_press(Message::NewFile) .on_press(Message::NewFile)
.padding(8) .padding(space_xxs)
.style(style::Button::Icon) .style(style::Button::Icon)
] ]
.align_items(Alignment::Center), .align_items(Alignment::Center),