leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update iced: includes DnD support for iced-sctk

Browse source
This commit is contained in:
Ashley Wulber 2023-04-04 16:37:06 -04:00 • committed by Ashley Wulber
parent 035ec88c1b
commit 2a5d4c3467
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
examples/cosmic-sctk/src/window.rs
View file

@ -2,11 +2,7 @@
// SPDX-License-Identifier: MPL-2.0 // SPDX-License-Identifier: MPL-2.0
use cosmic::{ use cosmic::{
iced::{ iced::{self, wayland::window::set_mode_window, Alignment, Application, Command, Length},
self,
wayland::{window::set_mode_window, SurfaceIdWrapper},
Alignment, Application, Command, Length,
},
iced::{ iced::{
wayland::window::{start_drag_window, toggle_maximize}, wayland::window::{start_drag_window, toggle_maximize},
widget::{ widget::{
@ -262,7 +258,7 @@ impl Application for Window {
Command::none() Command::none()
} }
fn view(&self, _: SurfaceIdWrapper) -> Element<Message> { fn view(&self, _: window::Id) -> Element<Message> {
let (nav_bar_message, nav_bar_toggled) = if self.is_condensed() { let (nav_bar_message, nav_bar_toggled) = if self.is_condensed() {
( (
Message::ToggleNavBarCondensed, Message::ToggleNavBarCondensed,
@ -362,8 +358,7 @@ impl Application for Window {
vec!["Option 1", "Option 2", "Option 3", "Option 4"], vec!["Option 1", "Option 2", "Option 3", "Option 4"],
self.pick_list_selected, self.pick_list_selected,
Message::PickListSelected, Message::PickListSelected,
) ),
.padding([8, 0, 8, 16]),
)) ))
.add(settings::item( .add(settings::item(
"Slider", "Slider",
@ -409,7 +404,7 @@ impl Application for Window {
self.theme.clone() self.theme.clone()
} }
fn close_requested(&self, id: SurfaceIdWrapper) -> Self::Message { fn close_requested(&self, id: window::Id) -> Self::Message {
Message::Close Message::Close
} }
fn subscription(&self) -> iced::Subscription<Self::Message> { fn subscription(&self) -> iced::Subscription<Self::Message> {

2
iced

@ -1 +1 @@
Subproject commit 910ea3698ad5087e10c6eecaac5c88232544ada0 Subproject commit 478075a89ae9d3cd019c2fcbcf2b1e9ed04c120c