From a01b9720deab782f3596930a5b00c2320dfa562e Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 19 Oct 2023 11:04:05 -0400
Subject: [PATCH] chore: update libcosmic

---
 Cargo.lock                         | 16 ++++++++++++++++
 Cargo.toml                         |  6 +++---
 cosmic-applet-tiling/src/window.rs |  4 ----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b6c2dc7b..e7ce7a3d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -935,6 +935,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -948,6 +949,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1046,6 +1048,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "almost",
  "cosmic-config",
@@ -2409,6 +2412,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.10.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2423,6 +2427,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "accesskit",
  "accesskit_unix",
@@ -2431,6 +2436,7 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.10.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "bitflags 1.3.2",
  "iced_accessibility",
@@ -2445,6 +2451,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.7.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "futures",
  "iced_core",
@@ -2457,6 +2464,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.9.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2474,6 +2482,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -2486,6 +2495,7 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.1.1"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2497,6 +2507,7 @@ dependencies = [
 [[package]]
 name = "iced_sctk"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "enum-repr",
  "float-cmp",
@@ -2520,6 +2531,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.9.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -2529,6 +2541,7 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -2546,6 +2559,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.11.1"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2567,6 +2581,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.1.3"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "iced_renderer",
  "iced_runtime",
@@ -2838,6 +2853,7 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#589b66175242e8f82f60a116e76f2c51783b70a2"
 dependencies = [
  "apply",
  "ashpd",
diff --git a/Cargo.toml b/Cargo.toml
index 6738cf42..e62ab495 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,8 +39,8 @@ lto = "thin"
 
 # [patch."https://github.com/pop-os/cosmic-time"]
 # cosmic-time = { path = "../cosmic-time" }
-[patch."https://github.com/pop-os/libcosmic"]
-libcosmic = { path = "../libcosmic" }
-cosmic-config = { path = "../libcosmic/cosmic-config" }
+# [patch."https://github.com/pop-os/libcosmic"]
+# libcosmic = { path = "../libcosmic" }
+# cosmic-config = { path = "../libcosmic/cosmic-config" }
 [patch."https://github.com/Smithay/client-toolkit"]
 sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "dc8c4a0" }
diff --git a/cosmic-applet-tiling/src/window.rs b/cosmic-applet-tiling/src/window.rs
index d2cfaf82..8acc8986 100644
--- a/cosmic-applet-tiling/src/window.rs
+++ b/cosmic-applet-tiling/src/window.rs
@@ -7,10 +7,7 @@ use cosmic::iced::wayland::popup::{destroy_popup, get_popup};
 use cosmic::iced::window::Id;
 use cosmic::iced::{Command, Length, Limits, Subscription};
 use cosmic::iced_core::Alignment;
-use cosmic::iced_futures::backend::native::tokio;
 use cosmic::iced_style::application;
-use cosmic::iced_widget::canvas::path::lyon_path::builder;
-use cosmic::iced_widget::graphics::image::image_rs::error;
 use cosmic::iced_widget::row;
 use cosmic::widget::{button, container, spin_button, text};
 use cosmic::{Element, Theme};
@@ -24,7 +21,6 @@ const ON: &str = "com.system76.CosmicAppletTiling.On";
 const OFF: &str = "com.system76.CosmicAppletTiling.Off";
 
 static TILE_WINDOWS: Lazy<id::Toggler> = Lazy::new(id::Toggler::unique);
-static SHOW_ACTIVE_HINTS: Lazy<id::Toggler> = Lazy::new(id::Toggler::unique);
 
 #[derive(Default)]
 pub struct Window {