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

fix(app): conditionally set context drawer padding

Browse source 
This fixes the cosmic-term terminal_box becoming cropped when opening a context drawer.
This commit is contained in:
Vukašin Vojinović 2024-11-06 17:53:32 +01:00 • committed by Michael Murphy
parent 6dfd9d7dd5
commit 3c5a2d9340
2 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/app/mod.rs
View file

@ -792,11 +792,18 @@ impl<App: Application> ApplicationExt for App {
// TODO: More granularity might be needed for different resize border
// and window border handling of maximized and tiled windows
let sharp_corners = core.window.sharp_corners;
let content_container = core.window.content_container;
let nav_bar_active = core.nav_bar_active();
let focused = core
.focused_window()
.is_some_and(|i| Some(i) == self.core().main_window_id());
let main_content_padding = if core.window.content_container {
[0, 8, 8, 8]
let main_content_padding = if content_container {
if nav_bar_active {
[0, 8, 8, 0]
} else {
[0, 8, 8, 8]
}
} else {
[0, 0, 0, 0]
};
@ -837,7 +844,11 @@ impl<App: Application> ApplicationExt for App {
))
})
.apply(container)
.padding([0, 8, 8, 0])
.padding(if content_container {
[0, 8, 8, 0]
} else {
[0, 0, 0, 0]
})
.into(),
);
} else {
@ -867,7 +878,11 @@ impl<App: Application> ApplicationExt for App {
))
})
.apply(container)
.padding([0, 8, 8, 0])
.padding(if content_container {
[0, 8, 8, 0]
} else {
[0, 0, 0, 0]
})
.into(),
)
} else {
@ -880,8 +895,6 @@ impl<App: Application> ApplicationExt for App {
widgets
});
let content_col = crate::widget::column::with_capacity(2)
//TODO: Add back when the `resize_border` is moved to not cover window content
//.spacing(8)
.push(content_row)
.push_maybe(
self.footer()