From 96c8527573bf47ce9fc7f413a43c35f98ae3c5c7 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Mon, 19 Dec 2022 16:20:52 -0500 Subject: [PATCH] feat: various improvements to window commands and event handling --- examples/cosmic-sctk/src/window.rs | 13 +++++++------ iced | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/examples/cosmic-sctk/src/window.rs b/examples/cosmic-sctk/src/window.rs index 13b0addc..7c43cfe6 100644 --- a/examples/cosmic-sctk/src/window.rs +++ b/examples/cosmic-sctk/src/window.rs @@ -2,10 +2,11 @@ // SPDX-License-Identifier: MPL-2.0 use cosmic::{ - iced::widget::{ + iced_native::window, + iced::{widget::{ column, container, horizontal_space, pick_list, progress_bar, radio, row, slider, - }, - iced::{self, wayland::SurfaceIdWrapper, Alignment, Application, Command, Length}, + }, wayland::window::{start_drag_window, toggle_maximize}}, + iced::{self, wayland::{SurfaceIdWrapper, window::set_mode_window}, Alignment, Application, Command, Length}, iced_lazy::responsive, theme::{self, Theme}, widget::{ @@ -108,9 +109,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 => todo!(), - Message::Minimize => todo!(), - Message::Maximize => todo!(), + Message::Drag => return start_drag_window(window::Id::new(0)), + Message::Minimize => return set_mode_window(window::Id::new(0), window::Mode::Hidden), + Message::Maximize => return toggle_maximize(window::Id::new(0)), Message::RowSelected(row) => println!("Selected row {row}"), Message::InputChanged => {} Message::Rectangle(r) => match r { diff --git a/iced b/iced index 4c92b828..29ab760c 160000 --- a/iced +++ b/iced @@ -1 +1 @@ -Subproject commit 4c92b828a3866d524d31738dd68e5dd84f208d0d +Subproject commit 29ab760cf086f6d53ca678923049094887928e42