From 5331cfb61b6fda520c29cc620f9e867b5605388f Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Wed, 9 Nov 2022 21:33:23 +0100
Subject: [PATCH] depend on iced_sctk + cosmic-design-system changes

---
 Cargo.toml                    | 14 +++++++-------
 examples/cosmic/src/window.rs |  7 ++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6f89ed9..76dedc2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,38 +22,38 @@ git = "https://github.com/pop-os/cosmic-theme.git"
 
 [dependencies.iced]
 git = "https://github.com/pop-os/iced.git"
-branch = "cosmic-design-system"
+branch = "sctk-cosmic"
 # path = "../iced"
 features = ["image", "svg"]
 
 [dependencies.iced_core]
 git = "https://github.com/pop-os/iced.git"
-branch = "cosmic-design-system"
+branch = "sctk-cosmic"
 # path = "../iced/core"
 
 [dependencies.iced_lazy]
 git = "https://github.com/pop-os/iced.git"
-branch = "cosmic-design-system"
+branch = "sctk-cosmic"
 # path = "../iced/lazy"
 
 [dependencies.iced_native]
 git = "https://github.com/pop-os/iced.git"
-branch = "cosmic-design-system"
+branch = "sctk-cosmic"
 # path = "../iced/native"
 
 [dependencies.iced_style]
 git = "https://github.com/pop-os/iced.git"
-branch = "cosmic-design-system"
+branch = "sctk-cosmic"
 # path = "../iced/style"
 
 [dependencies.iced_winit]
 git = "https://github.com/pop-os/iced.git"
-branch = "cosmic-design-system"
+branch = "sctk-cosmic"
 # path = "../iced/winit"
 
 [dependencies.iced_wgpu]
 git = "https://github.com/pop-os/iced.git"
-branch = "cosmic-design-system"
+branch = "sctk-cosmic"
 # path = "../iced/wgpu"
 
 [workspace]
diff --git a/examples/cosmic/src/window.rs b/examples/cosmic/src/window.rs
index 1a077de..b73d5e1 100644
--- a/examples/cosmic/src/window.rs
+++ b/examples/cosmic/src/window.rs
@@ -7,6 +7,7 @@ use cosmic::{
     iced::{self, Alignment, Application, Color, Command, Length},
     iced_lazy::responsive,
     iced_winit::window::{drag, maximize, minimize},
+    iced_native::window,
     list_view, list_view_item, list_view_row, list_view_section, scrollable,
     theme::{self, Theme},
     widget::{button, header_bar, list_box, list_row, list_view::*, toggler},
@@ -98,9 +99,9 @@ impl Application for Window {
             Message::PickListSelected(value) => self.pick_list_selected = Some(value),
             Message::Close => self.exit = true,
             Message::ToggleSidebar => self.sidebar_toggled = !self.sidebar_toggled,
-            Message::Drag => return drag(),
-            Message::Minimize => return minimize(),
-            Message::Maximize => return maximize(),
+            Message::Drag => return drag(window::Id::new(0)),
+            Message::Minimize => return minimize(window::Id::new(0)),
+            Message::Maximize => return maximize(window::Id::new(0)),
             Message::RowSelected(row) => println!("Selected row {row}"),
         }