From 9406fecd3026f489955d4662771f5243c734bc78 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 10 Feb 2024 20:39:50 -0700
Subject: [PATCH] Update dependencies, enable CSDs on redox, set min size

---
 Cargo.lock  |  7 +------
 Cargo.toml  |  3 ---
 src/main.rs | 12 ++----------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4d61e80..25e9761 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5740,7 +5740,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "winit"
 version = "0.29.10"
-source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#8987daa8e6a860b8927e040076482cd63b6e734f"
+source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f"
 dependencies = [
  "ahash",
  "android-activity",
@@ -6030,8 +6030,3 @@ dependencies = [
  "quote",
  "syn 1.0.109",
 ]
-
-[[patch.unused]]
-name = "smithay-client-toolkit"
-version = "0.16.1"
-source = "git+https://github.com/pop-os/client-toolkit?branch=wayland-resize#515820fc86cf8cb3ac8d087dc6c87852767627ca"
diff --git a/Cargo.toml b/Cargo.toml
index 477b83b..c50ce5e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,9 +32,6 @@ features = ["serde"]
 default = ["wgpu"]
 wgpu = ["libcosmic/wgpu"]
 
-[patch.crates-io]
-smithay-client-toolkit = { git = "https://github.com/pop-os/client-toolkit", branch = "wayland-resize" }
-
 [profile.release-with-debug]
 inherits = "release"
 debug = true
diff --git a/src/main.rs b/src/main.rs
index 229e597..e348921 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,7 +9,7 @@ use cosmic::{
         event::{self, Event},
         keyboard::{Event as KeyEvent, Key, Modifiers},
         subscription::{self, Subscription},
-        window, Alignment, Length,
+        window, Alignment, Length, Limits,
     },
     widget, Application, ApplicationExt, Element,
 };
@@ -71,15 +71,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let mut settings = Settings::default();
     settings = settings.theme(config.app_theme.theme());
-
-    #[cfg(target_os = "redox")]
-    {
-        // Redox does not support resize if doing CSDs
-        settings = settings.client_decorations(false);
-    }
-
-    //TODO: allow size limits on iced_winit
-    //settings = settings.size_limits(Limits::NONE.min_width(400.0).min_height(200.0));
+    settings = settings.size_limits(Limits::NONE.min_width(360.0).min_height(180.0));
 
     let flags = Flags {
         config_handler,