From 8137aa350c2165d9824acb79d453150f18a3ebc6 Mon Sep 17 00:00:00 2001
From: Ellie High <6687206+wizzeh@users.noreply.github.com>
Date: Tue, 24 Mar 2026 05:59:16 -0700
Subject: [PATCH] Allow fallback from smithay to arboard when getting clipboard
 (#7976)

<!--
Please read the "Making a PR" section of
[`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/main/CONTRIBUTING.md)
before opening a Pull Request!

* Keep your PR:s small and focused.
* The PR title is what ends up in the changelog, so make it descriptive!
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to
`egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for
maintainers to test and add commits to your PR.
* Remember to run `cargo fmt` and `cargo clippy`.
* Open the PR as a draft until you have self-reviewed it and run
`./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.

Please be patient! I will review your PR, but my time is limited!
-->

* [X] I have followed the instructions in the PR template

Quick fix -- when the arboard and smithay features are both enabled,
Clipboard::get returns early if it can't find a smithay clipboard. This
PR just allows fallback to arboard instead of early-returning.

---------

Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
---
 crates/egui-winit/src/clipboard.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/egui-winit/src/clipboard.rs b/crates/egui-winit/src/clipboard.rs
index 75d0469ec..2410c3ee6 100644
--- a/crates/egui-winit/src/clipboard.rs
+++ b/crates/egui-winit/src/clipboard.rs
@@ -65,13 +65,12 @@ impl Clipboard {
             feature = "smithay-clipboard"
         ))]
         if let Some(clipboard) = &mut self.smithay {
-            return match clipboard.load() {
-                Ok(text) => Some(text),
+            match clipboard.load() {
+                Ok(text) => return Some(text),
                 Err(err) => {
                     log::error!("smithay paste error: {err}");
-                    None
                 }
-            };
+            }
         }
 
         #[cfg(all(