From af1e16b1f59b5b45fd6df8b6aa7c8a062b7a0ebb Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Mon, 14 Nov 2022 16:58:54 +0100
Subject: [PATCH] fix: better popup container

---
 applets/cosmic-applet-graphics/Cargo.lock    |  2 +-
 applets/cosmic-applet-graphics/src/window.rs | 38 ++++++++++----------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/applets/cosmic-applet-graphics/Cargo.lock b/applets/cosmic-applet-graphics/Cargo.lock
index 872e05d8..49b51f2a 100644
--- a/applets/cosmic-applet-graphics/Cargo.lock
+++ b/applets/cosmic-applet-graphics/Cargo.lock
@@ -1546,7 +1546,7 @@ checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/?branch=sctk-cosmic-design-system#49f0f34270fb1cf4eba21ea4f45180dc37f224f9"
+source = "git+https://github.com/pop-os/libcosmic/?branch=sctk-cosmic-design-system#9174e4209964f3d924fb280c89301e8fba4967fb"
 dependencies = [
  "apply",
  "cosmic-panel-config",
diff --git a/applets/cosmic-applet-graphics/src/window.rs b/applets/cosmic-applet-graphics/src/window.rs
index af1e52e7..7ba05654 100644
--- a/applets/cosmic-applet-graphics/src/window.rs
+++ b/applets/cosmic-applet-graphics/src/window.rs
@@ -1,6 +1,6 @@
 use crate::dbus::{self, PowerDaemonProxy};
 use crate::graphics::{get_current_graphics, set_graphics, Graphics};
-use cosmic::applet::{get_popup_settings, icon_button};
+use cosmic::applet::{get_popup_settings, icon_button, popup_container};
 use cosmic::iced_style::application::{self, Appearance};
 use cosmic::separator;
 use cosmic::theme::Container;
@@ -13,9 +13,9 @@ use cosmic::{
     Element,
 };
 use cosmic_panel_config::{PanelAnchor, PanelSize};
-use iced_sctk::Color;
-use iced_sctk::alignment::Horizontal;
+use iced_sctk::alignment::{Horizontal, Vertical};
 use iced_sctk::commands::popup::{destroy_popup, get_popup};
+use iced_sctk::Color;
 use zbus::Connection;
 
 #[derive(Clone, Copy)]
@@ -214,24 +214,19 @@ impl Application for Window {
                 .into()
             }
         };
-        container(column(vec![
-            text("Graphics Mode")
-                .width(Length::Fill)
-                .horizontal_alignment(Horizontal::Center)
-                .size(24)
-                .into(),
-            separator!(1).into(),
-            content,
+        popup_container(
+            column(vec![
+                text("Graphics Mode")
+                    .width(Length::Fill)
+                    .horizontal_alignment(Horizontal::Center)
+                    .size(24)
+                    .into(),
+                separator!(1).into(),
+                content,
             ])
             .padding(4)
-            .spacing(4))
-        .style(Container::Custom(|theme| container::Appearance {
-            text_color: Some(theme.cosmic().on_bg_color().into()),
-            background: Some(theme.extended_palette().background.base.color.into()),
-            border_radius: 12.0,
-            border_width: 0.0,
-            border_color: Color::TRANSPARENT,
-        }))
+            .spacing(4),
+        )
         .into()
     }
 
@@ -252,7 +247,10 @@ impl Application for Window {
     }
 
     fn style(&self) -> <Self::Theme as application::StyleSheet>::Style {
-        <Self::Theme as application::StyleSheet>::Style::Custom(|theme| Appearance { background_color: Color::from_rgba(0.0, 0.0, 0.0, 0.0), text_color: theme.cosmic().on_bg_color().into() }) 
+        <Self::Theme as application::StyleSheet>::Style::Custom(|theme| Appearance {
+            background_color: Color::from_rgba(0.0, 0.0, 0.0, 0.0),
+            text_color: theme.cosmic().on_bg_color().into(),
+        })
     }
 
     fn view_window(&self, _: window::Id) -> Element<Message> {