Support for diffrent mouse buttons in UI buttons

crates/bevy_input/src/input.rs

@@ -3,9 +3,9 @@ use std::hash::Hash;
 
 /// A "press-able" input of type `T`
 pub struct Input<T> {
-    pressed: HashSet<T>,
-    just_pressed: HashSet<T>,
-    just_released: HashSet<T>,
+    pub pressed: HashSet<T>,
+    pub just_pressed: HashSet<T>,
+    pub just_released: HashSet<T>,
 }
 
 impl<T> Default for Input<T> {

crates/bevy_input/src/mouse.rs

@@ -21,6 +21,17 @@ pub enum MouseButton {
     Other(u8),
 }
 
+impl Into<u16> for MouseButton {
+    fn into(self) -> u16 {
+        match self {
+            MouseButton::Left => 0,
+            MouseButton::Right => 1,
+            MouseButton::Middle => 2,
+            MouseButton::Other(i) => (i as u16),
+        }
+    }
+}
+
 /// A mouse motion event
 #[derive(Debug, Clone)]
 pub struct MouseMotion {

crates/bevy_ui/src/focus.rs

@@ -9,11 +9,44 @@ use bevy_window::CursorMoved;
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub enum Interaction {
-    Clicked,
+    Clicked(MouseFlags),
     Hovered,
     None,
 }
 
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub struct MouseFlags(u16);
+
+impl MouseFlags {
+    pub fn check(self, button: MouseButton) -> bool {
+        let i: u16 = button.into();
+        ((self.0 << i) >> 15) > 0
+    }
+
+    pub fn build(button: &MouseButton) -> Self {
+        button.clone().into()
+    }
+
+    pub fn remove(&mut self, button: &MouseButton) {
+        let i: u16 = button.clone().into();
+        let mask = !((u16::MAX << 15) >> i);
+        self.0 &= mask;
+    }
+
+    pub fn add(&mut self, button: &MouseButton) {
+        let i: u16 = button.clone().into();
+        let mask = (u16::MAX << 15) >> i;
+        self.0 |= mask;
+    }
+}
+
+impl From<MouseButton> for MouseFlags {
+    fn from(button: MouseButton) -> Self {
+        let i: u16 = button.into();
+        MouseFlags((u16::MAX << 15) >> i)
+    }
+}
+
 impl Default for Interaction {
     fn default() -> Self {
         Interaction::None
@@ -55,17 +88,23 @@ pub fn ui_focus_system(
         state.cursor_position = cursor_moved.position;
     }
 
-    if mouse_button_input.just_released(MouseButton::Left) {
-        for (_entity, _node, _transform, interaction, _focus_policy) in &mut node_query.iter() {
-            if let Some(mut interaction) = interaction {
-                if *interaction == Interaction::Clicked {
+    for (_entity, _node, _transform, interaction, _focus_policy) in &mut node_query.iter() {
+        if let Some(mut interaction) = interaction {
+            for released in &mouse_button_input.just_released {
+                if let Interaction::Clicked(mut flags) = *interaction {
+                    flags.remove(released);
+                    *interaction = Interaction::Clicked(flags);
+                }
+            }
+
+            if let Interaction::Clicked(flags) = *interaction {
+                if flags.0 == 0 {
                     *interaction = Interaction::None;
                 }
             }
         }
     }
 
-    let mouse_clicked = mouse_button_input.just_pressed(MouseButton::Left);
     let mut hovered_entity = None;
 
     {
@@ -97,13 +136,30 @@ pub fn ui_focus_system(
         moused_over_z_sorted_nodes.sort_by_key(|(_, _, _, z)| -*z);
         for (entity, focus_policy, interaction, _) in moused_over_z_sorted_nodes {
             if let Some(mut interaction) = interaction {
-                if mouse_clicked {
-                    // only consider nodes with ClickState "clickable"
-                    if *interaction != Interaction::Clicked {
-                        *interaction = Interaction::Clicked;
-                    }
-                } else if *interaction == Interaction::None {
+                //Build bitflags out of hashset
+                let new_flags = mouse_button_input.just_pressed.iter().fold(
+                    MouseFlags(0),
+                    |mut flags, button| {
+                        flags.add(button);
+                        flags
+                    },
+                );
+
+                let old_flags =
+                    mouse_button_input
+                        .pressed
+                        .iter()
+                        .fold(MouseFlags(0), |mut flags, button| {
+                            flags.add(button);
+                            flags
+                        });
+
+                if old_flags.0 == 0
+                // nothing is clicked
+                {
                     *interaction = Interaction::Hovered;
+                } else if new_flags.0 != 0 {
+                    *interaction = Interaction::Clicked(old_flags)
                 }
             }
 

crates/bevy_ui/src/lib.rs

@@ -20,7 +20,7 @@ pub mod prelude {
         entity::*,
         node::*,
         widget::{Button, Text},
-        Anchors, Interaction, Margins,
+        Anchors, Interaction, Margins, MouseFlags,
     };
 }
 

examples/ui/button.rs

@@ -40,8 +40,19 @@ fn button_system(
     for (_button, interaction, mut material, children) in &mut interaction_query.iter() {
         let mut text = text_query.get_mut::<Text>(children[0]).unwrap();
         match *interaction {
-            Interaction::Clicked => {
-                text.value = "Press".to_string();
+            Interaction::Clicked(i) => {
+                let mut s = String::with_capacity(20);
+                if i.check(MouseButton::Left) {
+                    s.push_str(" Left");
+                }
+                if i.check(MouseButton::Right) {
+                    s.push_str(" Right");
+                }
+                if i.check(MouseButton::Middle) {
+                    s.push_str(" Middle");
+                }
+
+                text.value = format!("Pressing button(s){}", s).to_string();
                 *material = button_materials.pressed;
             }
             Interaction::Hovered => {
@@ -66,7 +77,7 @@ fn setup(
         .spawn(UiCameraComponents::default())
         .spawn(ButtonComponents {
             style: Style {
-                size: Size::new(Val::Px(150.0), Val::Px(65.0)),
+                size: Size::new(Val::Px(550.0), Val::Px(65.0)),
                 // center button
                 margin: Rect::all(Val::Auto),
                 // horizontally center child text