Selectable Text + Context Menu

examples/application/Cargo.toml

@@ -13,13 +13,14 @@ env_logger = "0.11"
 [dependencies.libcosmic]
 path = "../../"
 features = [
-    "debug",
-    "winit",
-    "tokio",
-    "xdg-portal",
-    "a11y",
-    "single-instance",
-    "surface-message",
-    "multi-window",
-    "wgpu",
+  "debug",
+  "winit",
+  "tokio",
+  "xdg-portal",
+  "a11y",
+  "single-instance",
+  "surface-message",
+  "multi-window",
+  "wgpu",
+  "wayland",
 ]

examples/application/src/main.rs

@@ -8,6 +8,7 @@ use cosmic::iced::{Alignment, Length, Size};
 use cosmic::prelude::*;
 use cosmic::widget::menu::{self, KeyBind};
 use cosmic::widget::nav_bar;
+use cosmic::widget::text_editor::{self, Content};
 use cosmic::{executor, iced, widget, Core};
 use std::collections::HashMap;
 use std::sync::LazyLock;
@@ -84,6 +85,7 @@ pub enum Message {
     Hi2,
     Hi3,
     Tick,
+    EditorAction(text_editor::Action),
 }
 
 /// The [`App`] stores application-specific state.
@@ -95,6 +97,7 @@ pub struct App {
     hidden: bool,
     keybinds: HashMap<KeyBind, Action>,
     progress: f32,
+    editor_content: text_editor::Content,
 }
 
 /// Implement [`cosmic::Application`] to integrate with COSMIC.
@@ -137,6 +140,9 @@ impl cosmic::Application for App {
             hidden: true,
             keybinds: HashMap::new(),
             progress: 0.0,
+            editor_content: text_editor::Content::with_text(
+                "This is a text editor.\nTry right-clicking for a context menu.\n\nمتن فارسی در ادیتور",
+            ),
         };
 
         let command = app.update_title();
@@ -185,6 +191,9 @@ impl cosmic::Application for App {
             Message::Tick => {
                 self.progress = (self.progress + 0.01) % 1.0;
             }
+            Message::EditorAction(action) => {
+                self.editor_content.perform(action);
+            }
         }
         Task::none()
     }
@@ -201,8 +210,37 @@ impl cosmic::Application for App {
             .map_or("No page selected", String::as_str);
 
         let centered = widget::container(
-            widget::column::with_capacity(14)
+            widget::column::with_capacity(20)
                 .push(widget::text::body(page_content))
+                .push(widget::text::title4("Selectable Title").selectable())
+                .push(
+                    widget::text::body(
+                        "This text is selectable. Try clicking and dragging to select, \
+                         double-click to select a word, or triple-click to select all. \
+                         Press Ctrl+C to copy, or right-click for a context menu.",
+                    )
+                    .selectable(),
+                )
+                .push(
+                    widget::text::caption("Selectable caption text. No right-click context menu.")
+                        .selectable()
+                        .context_menu(false),
+                )
+                .push(
+                    widget::text::body("متن فارسی برای تست انتخاب متن از راست به چپ").selectable(),
+                )
+                .push(
+                    widget::text::body(
+                        "Mixed text: Hello سلام World دنیا! Some English and فارسی together.",
+                    )
+                    .selectable(),
+                )
+                .push(
+                    text_editor::text_editor(&self.editor_content)
+                        .placeholder("Text editor...")
+                        .on_action(Message::EditorAction)
+                        .height(Length::Fixed(120.0)),
+                )
                 .push(
                     widget::text_input::text_input("", &self.input_1)
                         .on_input(Message::Input1)

examples/text-input/Cargo.toml

@@ -10,4 +10,4 @@ tracing-log = "0.2.0"
 
 [dependencies.libcosmic]
 path = "../../"
-features = ["debug", "winit", "wgpu", "tokio", "xdg-portal"]
+features = ["debug", "winit", "wgpu", "tokio", "xdg-portal", "wayland"]

src/app/cosmic.rs

@@ -276,7 +276,6 @@ where
                         }
                 }) {
                     let settings = settings();
-
                     self.get_popup(settings, Box::new(move |_| view()))
                 } else {
                     iced_winit::commands::popup::get_popup(settings())
@@ -375,7 +374,7 @@ where
         &mut self,
         message: crate::Action<T::Message>,
     ) -> iced::Task<crate::Action<T::Message>> {
-        let message = match message {
+        let mut task = match message {
             crate::Action::App(message) => self.app.update(message),
             crate::Action::Cosmic(message) => self.cosmic_update(message),
             crate::Action::None => iced::Task::none(),
@@ -395,7 +394,7 @@ where
         #[cfg(all(target_env = "gnu", not(target_os = "windows")))]
         crate::malloc::trim(0);
 
-        message
+        task
     }
 
     #[cfg(not(feature = "multi-window"))]
@@ -572,9 +571,14 @@ where
     #[cfg(feature = "multi-window")]
     pub fn view(&self, id: window::Id) -> Element<'_, crate::Action<T::Message>> {
         #[cfg(all(feature = "wayland", target_os = "linux"))]
-        if let Some((_, _, v)) = self.surface_views.get(&id) {
+        if let Some((_parent, _surface_id, v)) = self.surface_views.get(&id) {
             return v(&self.app);
         }
+        #[cfg(feature = "wayland")]
+        if let Some(element) = crate::widget::text_context_menu::popup_view_for_id::<T::Message>(id)
+        {
+            return element;
+        }
         if self
             .app
             .core()
@@ -584,6 +588,8 @@ where
             return self.app.view_window(id).map(crate::Action::App);
         }
 
+        crate::widget::text_context_menu::set_current_window_id(id);
+
         let view = if self.app.core().window.use_template {
             self.app.view_main()
         } else {
@@ -598,6 +604,9 @@ where
 
     #[cfg(not(feature = "multi-window"))]
     pub fn view(&self) -> Element<crate::Action<T::Message>> {
+        if let Some(id) = self.app.core().main_window_id() {
+            crate::widget::text_context_menu::set_current_window_id(id);
+        }
         let view = self.app.view_main();
 
         #[cfg(all(target_env = "gnu", not(target_os = "windows")))]

src/applet/mod.rs

@@ -290,7 +290,7 @@ impl Context {
         )
     }
 
-    pub fn applet_tooltip<'a, Message: 'static>(
+    pub fn applet_tooltip<'a, Message: Clone + 'static>(
         &self,
         content: impl Into<Element<'a, Message>>,
         tooltip: impl Into<Cow<'static, str>>,
@@ -501,7 +501,7 @@ impl Context {
         }
     }
 
-    pub fn text<'a>(&self, msg: impl Into<Cow<'a, str>>) -> crate::widget::Text<'a, crate::Theme> {
+    pub fn text<'a>(&self, msg: impl Into<Cow<'a, str>>) -> crate::widget::Text<'a> {
         let msg = msg.into();
         let t = match self.size {
             Size::Hardcoded(_) => crate::widget::text,

src/theme/style/iced.rs

@@ -1338,18 +1338,19 @@ impl iced_widget::text::Catalog for Theme {
     }
 
     fn style(&self, class: &Self::Class<'_>) -> iced_widget::text::Style {
+        let selected_fill = self.cosmic().accent.base.into();
         match class {
             Text::Accent => iced_widget::text::Style {
                 color: Some(self.cosmic().accent_text_color().into()),
-                ..Default::default()
+                selected_fill,
             },
             Text::Default => iced_widget::text::Style {
                 color: None,
-                ..Default::default()
+                selected_fill,
             },
             Text::Color(c) => iced_widget::text::Style {
                 color: Some(*c),
-                ..Default::default()
+                selected_fill,
             },
             Text::Custom(f) => f(self),
         }

src/widget/menu/menu_inner.rs

@@ -243,7 +243,7 @@ pub(super) struct MenuSlice {
 #[derive(Debug, Clone)]
 /// Menu bounds in overlay space
 pub struct MenuBounds {
-    child_positions: Vec<f32>,
+    pub(crate) child_positions: Vec<f32>,
     child_sizes: Vec<Size>,
     children_bounds: Rectangle,
     pub parent_bounds: Rectangle,

src/widget/menu/menu_tree.rs

@@ -194,7 +194,7 @@ pub fn menu_root<'a, Message, Renderer: renderer::Renderer>(
 ) -> Button<'a, Message>
 where
     Element<'a, Message, crate::Theme, Renderer>: From<widget::Button<'a, Message>>,
-    Message: std::clone::Clone + 'a,
+    Message: std::clone::Clone + 'static,
 {
     widget::button::custom(widget::text(label))
         .padding([4, 12])

src/widget/mod.rs

@@ -89,8 +89,9 @@ pub use iced::widget::{Slider, VerticalSlider, slider, vertical_slider};
 #[doc(inline)]
 pub use iced::widget::{Svg, svg};
 
+pub mod text_editor;
 #[doc(inline)]
-pub use iced::widget::{TextEditor, text_editor};
+pub use text_editor::TextEditor;
 
 #[doc(inline)]
 pub use iced_core::widget::{Id, Operation, Widget};
@@ -295,6 +296,10 @@ pub mod text;
 #[doc(inline)]
 pub use text::{Text, text};
 
+pub mod text_context_menu;
+#[doc(inline)]
+pub use text_context_menu::HasSelectableText;
+
 pub mod text_input;
 #[doc(inline)]
 pub use text_input::{

src/widget/settings/item.rs

@@ -14,12 +14,12 @@ use taffy::AlignContent;
 /// A settings item aligned in a row
 #[must_use]
 #[allow(clippy::module_name_repetitions)]
-pub fn item<'a, Message: 'static>(
+pub fn item<'a, Message: Clone + 'static>(
     title: impl Into<Cow<'a, str>> + 'a,
     widget: impl Into<Element<'a, Message>> + 'a,
 ) -> Row<'a, Message, Theme> {
     #[inline(never)]
-    fn inner<'a, Message: 'static>(
+    fn inner<'a, Message: Clone + 'static>(
         title: Cow<'a, str>,
         widget: Element<'a, Message>,
     ) -> Row<'a, Message, Theme> {
@@ -45,12 +45,12 @@ pub fn item_row<Message>(children: Vec<Element<Message>>) -> Row<Message, Theme>
 
 /// A settings item aligned in a flex row
 #[allow(clippy::module_name_repetitions)]
-pub fn flex_item<'a, Message: 'static>(
+pub fn flex_item<'a, Message: Clone + 'static>(
     title: impl Into<Cow<'a, str>> + 'a,
     widget: impl Into<Element<'a, Message>> + 'a,
 ) -> FlexRow<'a, Message> {
     #[inline(never)]
-    fn inner<'a, Message: 'static>(
+    fn inner<'a, Message: Clone + 'static>(
         title: Cow<'a, str>,
         widget: Element<'a, Message>,
     ) -> FlexRow<'a, Message> {