From ff8e4826b393506ba3f77d135c1698dde444c9f7 Mon Sep 17 00:00:00 2001
From: Andreas Reich <andreas@rerun.io>
Date: Mon, 15 May 2023 15:10:54 +0200
Subject: [PATCH] Add egui::Modifiers::contains (#2989)

---
 crates/egui/src/data/input.rs | 59 +++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/crates/egui/src/data/input.rs b/crates/egui/src/data/input.rs
index b36a9af1..2be1e157 100644
--- a/crates/egui/src/data/input.rs
+++ b/crates/egui/src/data/input.rs
@@ -510,6 +510,65 @@ impl Modifiers {
 
         true
     }
+
+    /// Whether another set of modifiers is contained in this set of modifiers with proper handling of [`Self::command`].
+    ///
+    /// ```
+    /// # use egui::Modifiers;
+    /// assert!(Modifiers::default().contains(Modifiers::default()));
+    /// assert!(Modifiers::CTRL.contains(Modifiers::default()));
+    /// assert!(Modifiers::CTRL.contains(Modifiers::CTRL));
+    /// assert!(Modifiers::CTRL.contains(Modifiers::COMMAND));
+    /// assert!(Modifiers::MAC_CMD.contains(Modifiers::COMMAND));
+    /// assert!(Modifiers::COMMAND.contains(Modifiers::MAC_CMD));
+    /// assert!(Modifiers::COMMAND.contains(Modifiers::CTRL));
+    /// assert!(!(Modifiers::ALT | Modifiers::CTRL).contains(Modifiers::SHIFT));
+    /// assert!((Modifiers::CTRL | Modifiers::SHIFT).contains(Modifiers::CTRL));
+    /// assert!(!Modifiers::CTRL.contains(Modifiers::CTRL | Modifiers::SHIFT));
+    /// ```
+    pub fn contains(&self, query: Modifiers) -> bool {
+        if query == Modifiers::default() {
+            return true;
+        }
+
+        let Modifiers {
+            alt,
+            ctrl,
+            shift,
+            mac_cmd,
+            command,
+        } = *self;
+
+        if alt && query.alt {
+            return self.contains(Modifiers {
+                alt: false,
+                ..query
+            });
+        }
+        if shift && query.shift {
+            return self.contains(Modifiers {
+                shift: false,
+                ..query
+            });
+        }
+
+        if (ctrl || command) && (query.ctrl || query.command) {
+            return self.contains(Modifiers {
+                command: false,
+                ctrl: false,
+                ..query
+            });
+        }
+        if (mac_cmd || command) && (query.mac_cmd || query.command) {
+            return self.contains(Modifiers {
+                mac_cmd: false,
+                command: false,
+                ..query
+            });
+        }
+
+        false
+    }
 }
 
 impl std::ops::BitOr for Modifiers {