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

Fix spacing issue introduced in #614

Browse source
This commit is contained in:
Jeremy Soller 2024-09-20 11:38:28 -06:00
parent e56a94b783
commit ddb678ca69
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/app/mod.rs
View file

@ -653,7 +653,7 @@ impl<App: Application> ApplicationExt for App {
.is_some_and(|i| i == self.main_window_id()); .is_some_and(|i| i == self.main_window_id());
let content_row = crate::widget::row::with_children({ let content_row = crate::widget::row::with_children({
let mut widgets = Vec::with_capacity(3); let mut widgets = Vec::with_capacity(4);
// Insert nav bar onto the left side of the window. // Insert nav bar onto the left side of the window.
if let Some(nav) = self if let Some(nav) = self
@ -664,6 +664,11 @@ impl<App: Application> ApplicationExt for App {
} }
if self.nav_model().is_none() || core.show_content() { if self.nav_model().is_none() || core.show_content() {
// Manual spacing must be used due to state workarounds below
if !widgets.is_empty() {
widgets.push(horizontal_space(Length::Fixed(8.0)).into());
}
widgets.push(self.view().map(Message::App)); widgets.push(self.view().map(Message::App));
if let Some(context) = self.context_drawer() { if let Some(context) = self.context_drawer() {
@ -676,7 +681,8 @@ impl<App: Application> ApplicationExt for App {
Length::Shrink Length::Shrink
} else { } else {
//TODO: this width must be synced with the context drawer width //TODO: this width must be synced with the context drawer width
Length::Fixed(480.0) // Manual spacing must be used due to state workarounds below
Length::Fixed(480.0 + 8.0)
}), }),
context.map(Message::App), context.map(Message::App),
) )
@ -688,14 +694,13 @@ impl<App: Application> ApplicationExt for App {
}), }),
); );
} else { } else {
//TODO: this element is added to prevent state issues //TODO: this element is added to workaround state issues
widgets.push(horizontal_space(Length::Shrink).into()); widgets.push(horizontal_space(Length::Shrink).into());
} }
} }
widgets widgets
}) });
.spacing(8);
let content: Element<_> = if core.window.content_container { let content: Element<_> = if core.window.content_container {
content_row content_row
.apply(crate::widget::container) .apply(crate::widget::container)