Update dependencies, enable CSDs on redox, set min size

This commit is contained in:
Jeremy Soller 2024-02-10 20:39:50 -07:00
parent c2206b6770
commit 9406fecd30
3 changed files with 3 additions and 19 deletions

7
Cargo.lock generated
View file

@ -5740,7 +5740,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]] [[package]]
name = "winit" name = "winit"
version = "0.29.10" 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 = [ dependencies = [
"ahash", "ahash",
"android-activity", "android-activity",
@ -6030,8 +6030,3 @@ dependencies = [
"quote", "quote",
"syn 1.0.109", "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"

View file

@ -32,9 +32,6 @@ features = ["serde"]
default = ["wgpu"] default = ["wgpu"]
wgpu = ["libcosmic/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] [profile.release-with-debug]
inherits = "release" inherits = "release"
debug = true debug = true

View file

@ -9,7 +9,7 @@ use cosmic::{
event::{self, Event}, event::{self, Event},
keyboard::{Event as KeyEvent, Key, Modifiers}, keyboard::{Event as KeyEvent, Key, Modifiers},
subscription::{self, Subscription}, subscription::{self, Subscription},
window, Alignment, Length, window, Alignment, Length, Limits,
}, },
widget, Application, ApplicationExt, Element, widget, Application, ApplicationExt, Element,
}; };
@ -71,15 +71,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut settings = Settings::default(); let mut settings = Settings::default();
settings = settings.theme(config.app_theme.theme()); settings = settings.theme(config.app_theme.theme());
settings = settings.size_limits(Limits::NONE.min_width(360.0).min_height(180.0));
#[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));
let flags = Flags { let flags = Flags {
config_handler, config_handler,