From 40792f21de4efb81dcdcab3fe8ca72c78a51be02 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Tue, 5 May 2026 13:11:35 -0400
Subject: [PATCH] Revert "remove header container"

This reverts commit 8035ef9535fa87deb05d88594a6b6a412324c039.
---
 src/app/mod.rs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/app/mod.rs b/src/app/mod.rs
index b007757c..e2d6ae1c 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -815,7 +815,33 @@ impl<App: Application> ApplicationExt for App {
                         header = header.end(element.map(crate::Action::App));
                     }
 
-                    header.apply(|w| id_container(w, iced_core::id::Id::new("COSMIC_header")))
+                    if content_container {
+                        header.apply(|w| id_container(w, iced_core::id::Id::new("COSMIC_header")))
+                    } else {
+                        // Needed to avoid header bar corner gaps for apps without a content container
+                        header
+                            .apply(container)
+                            .class(crate::theme::Container::custom(move |theme| {
+                                let cosmic = theme.cosmic();
+                                container::Style {
+                                    background: Some(iced::Background::Color(
+                                        cosmic.background(theme.transparent).base.into(),
+                                    )),
+                                    border: iced::Border {
+                                        radius: [
+                                            (window_corner_radius[0] - 1.0).max(0.0),
+                                            (window_corner_radius[1] - 1.0).max(0.0),
+                                            cosmic.radius_0()[2],
+                                            cosmic.radius_0()[3],
+                                        ]
+                                        .into(),
+                                        ..Default::default()
+                                    },
+                                    ..Default::default()
+                                }
+                            }))
+                            .apply(|w| id_container(w, iced_core::id::Id::new("COSMIC_header")))
+                    }
                 })
             } else {
                 None