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

fix(style): use radius_s for nav bar toggle

Browse source
This commit is contained in:
Vukašin Vojinović 2024-12-05 21:16:10 +01:00 • committed by Michael Murphy
parent 75a11b3c84
commit 2d06ec4226
5 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/app/mod.rs
View file

@ -703,11 +703,14 @@ impl<App: Application> ApplicationExt for App {
.focused_window()
.is_some_and(|i| Some(i) == self.core().main_window_id());
// Offset for the window border
let window_padding = if sharp_corners { 8 } else { 7 };
let main_content_padding = if content_container {
if nav_bar_active {
[0, 8, 8, 0]
[0, window_padding, window_padding, 0]
} else {
[0, 8, 8, 8]
[0, window_padding, window_padding, window_padding]
}
} else {
[0, 0, 0, 0]
@ -721,7 +724,11 @@ impl<App: Application> ApplicationExt for App {
.nav_bar()
.map(|nav| id_container(nav, iced_core::id::Id::new("COSMIC_nav_bar")))
{
widgets.push(container(nav).padding([0, 8, 8, 8]).into());
widgets.push(
container(nav)
.padding([0, window_padding, window_padding, window_padding])
.into(),
);
true
} else {
false
@ -753,7 +760,7 @@ impl<App: Application> ApplicationExt for App {
})
.apply(container)
.padding(if content_container {
[0, 8, 8, 0]
[0, window_padding, window_padding, 0]
} else {
[0, 0, 0, 0]
})
@ -801,7 +808,7 @@ impl<App: Application> ApplicationExt for App {
})
.apply(container)
.padding(if content_container {
[0, 8, 8, 0]
[0, window_padding, window_padding, 0]
} else {
[0, 0, 0, 0]
})
@ -818,10 +825,14 @@ impl<App: Application> ApplicationExt for App {
});
let content_col = crate::widget::column::with_capacity(2)
.push(content_row)
.push_maybe(
self.footer()
.map(|footer| container(footer.map(Message::App)).padding([0, 8, 8, 8])),
);
.push_maybe(self.footer().map(|footer| {
container(footer.map(Message::App)).padding([
0,
window_padding,
window_padding,
window_padding,
])
}));
let content: Element<_> = if core.window.content_container {
content_col
.apply(container)
@ -840,6 +851,7 @@ impl<App: Application> ApplicationExt for App {
let mut header = crate::widget::header_bar()
.focused(focused)
.title(&core.window.header_title)
.horizontal_padding(window_padding)
.on_drag(Message::Cosmic(cosmic::Message::Drag))
.on_right_click(Message::Cosmic(cosmic::Message::ShowWindowMenu))
.on_double_click(Message::Cosmic(cosmic::Message::Maximize));
@ -852,8 +864,7 @@ impl<App: Application> ApplicationExt for App {
Message::Cosmic(cosmic::Message::ToggleNavBarCondensed)
} else {
Message::Cosmic(cosmic::Message::ToggleNavBar)
})
.class(crate::theme::Button::HeaderBar);
});
header = header.start(toggle);
}