From fb420a82e19c358ff3ab68ede69149875ed9eeec Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Wed, 8 Nov 2023 20:25:11 -0500 Subject: [PATCH] update iced --- iced | 2 +- src/widget/color_picker/mod.rs | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/iced b/iced index 8656300f0b4..b98c0f2006b 160000 --- a/iced +++ b/iced @@ -1 +1 @@ -Subproject commit 8656300f0b4789297c8eeb5952fbc7e3db107475 +Subproject commit b98c0f2006bae371afadb52d4799ea95aacdbb77 diff --git a/src/widget/color_picker/mod.rs b/src/widget/color_picker/mod.rs index 2bf23260169..5f0700a9316 100644 --- a/src/widget/color_picker/mod.rs +++ b/src/widget/color_picker/mod.rs @@ -20,8 +20,7 @@ use iced_core::{ layout, mouse, renderer, Background, Clipboard, Color, Layout, Length, Radians, Rectangle, Renderer, Shell, Vector, Widget, }; -#[cfg(feature = "wayland")] -use iced_sctk::commands::data_device::set_selection; + use iced_style::slider::{HandleShape, RailBackground}; use iced_widget::{canvas, column, horizontal_space, row, scrollable, vertical_space, Row}; use lazy_static::lazy_static; @@ -158,16 +157,8 @@ impl ColorPickerModel { } ColorPickerUpdate::Copied(t) => { self.copied_at = Some(t); - #[cfg(feature = "wayland")] - return set_selection( - crate::widget::SUPPORTED_TEXT_MIME_TYPES - .iter() - .map(ToString::to_string) - .collect(), - Box::new(crate::widget::text_input::TextInputString( - self.input_color.clone(), - )), - ); + + return iced::clipboard::write(self.input_color.clone()); } ColorPickerUpdate::Reset => { self.must_clear_cache.store(true, Ordering::SeqCst);