From d888f2bd3bbaf5214c2f82898685700f8059523c Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Tue, 13 Dec 2022 10:18:07 -0500
Subject: [PATCH] fix: use latest iced & commit hash for sctk

---
 Cargo.toml                         | 2 +-
 examples/cosmic-sctk/Cargo.toml    | 2 +-
 examples/cosmic-sctk/src/window.rs | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ce06f64..ad49852 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ derive_setters = "0.1.5"
 lazy_static = "1.4.0"
 palette = "0.6.1"
 cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", default-features = false, optional = true }
-sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", optional = true }
+sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", optional = true, rev = "f1d9c3e" }
 
 [dependencies.cosmic-theme]
 git = "https://github.com/pop-os/cosmic-theme.git"
diff --git a/examples/cosmic-sctk/Cargo.toml b/examples/cosmic-sctk/Cargo.toml
index ec6669e..cc6b607 100644
--- a/examples/cosmic-sctk/Cargo.toml
+++ b/examples/cosmic-sctk/Cargo.toml
@@ -7,4 +7,4 @@ publish = false
 
 [dependencies]
 libcosmic = { path = "../..", default-features = false, features = ["debug", "wayland"] }
-iced_sctk = { git = "https://github.com/pop-os/iced-sctk" }
+# iced_sctk = { git = "https://github.com/pop-os/iced-sctk" }
diff --git a/examples/cosmic-sctk/src/window.rs b/examples/cosmic-sctk/src/window.rs
index f588bb9..ca7a887 100644
--- a/examples/cosmic-sctk/src/window.rs
+++ b/examples/cosmic-sctk/src/window.rs
@@ -2,18 +2,16 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use cosmic::{
-    iced_native::window,
     iced::widget::{
         column, container, horizontal_space, pick_list, progress_bar, radio, row, slider,
     },
-    iced::{self, Alignment, Application, Command, Length},
+    iced::{self, Alignment, Application, Command, Length, wayland::SurfaceIdWrapper},
     iced_lazy::responsive,
     theme::{self, Theme},
     widget::{button, nav_button, nav_bar, nav_bar_page, nav_bar_section, header_bar, settings, scrollable, toggler},
     Element,
     ElementExt,
 };
-use iced_sctk::application::SurfaceIdWrapper;
 use std::{collections::BTreeMap, vec};
 use theme::Button as ButtonTheme;
 
@@ -326,7 +324,7 @@ impl Application for Window {
         self.theme
     }
     
-    fn close_requested(&self, id: iced_sctk::application::SurfaceIdWrapper) -> Self::Message {
+    fn close_requested(&self, id: SurfaceIdWrapper) -> Self::Message {
         Message::Close
     }
 }