From 2a5d4c346797f83e7f897e01bedfebe22fc5be08 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Tue, 4 Apr 2023 16:37:06 -0400 Subject: [PATCH] update iced: includes DnD support for iced-sctk --- examples/cosmic-sctk/src/window.rs | 13 ++++--------- iced | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/examples/cosmic-sctk/src/window.rs b/examples/cosmic-sctk/src/window.rs index 525bcbb0..920428b0 100644 --- a/examples/cosmic-sctk/src/window.rs +++ b/examples/cosmic-sctk/src/window.rs @@ -2,11 +2,7 @@ // SPDX-License-Identifier: MPL-2.0 use cosmic::{ - iced::{ - self, - wayland::{window::set_mode_window, SurfaceIdWrapper}, - Alignment, Application, Command, Length, - }, + iced::{self, wayland::window::set_mode_window, Alignment, Application, Command, Length}, iced::{ wayland::window::{start_drag_window, toggle_maximize}, widget::{ @@ -262,7 +258,7 @@ impl Application for Window { Command::none() } - fn view(&self, _: SurfaceIdWrapper) -> Element { + fn view(&self, _: window::Id) -> Element { let (nav_bar_message, nav_bar_toggled) = if self.is_condensed() { ( Message::ToggleNavBarCondensed, @@ -362,8 +358,7 @@ impl Application for Window { vec!["Option 1", "Option 2", "Option 3", "Option 4"], self.pick_list_selected, Message::PickListSelected, - ) - .padding([8, 0, 8, 16]), + ), )) .add(settings::item( "Slider", @@ -409,7 +404,7 @@ impl Application for Window { self.theme.clone() } - fn close_requested(&self, id: SurfaceIdWrapper) -> Self::Message { + fn close_requested(&self, id: window::Id) -> Self::Message { Message::Close } fn subscription(&self) -> iced::Subscription { diff --git a/iced b/iced index 910ea369..478075a8 160000 --- a/iced +++ b/iced @@ -1 +1 @@ -Subproject commit 910ea3698ad5087e10c6eecaac5c88232544ada0 +Subproject commit 478075a89ae9d3cd019c2fcbcf2b1e9ed04c120c