Change logic

Author: PoignardAzur

masonry/src/widgets/button.rs

@@ -112,14 +112,15 @@ impl Widget for Button {
         event: &PointerEvent,
     ) {
         match event {
-            PointerEvent::Down {
-                button: Some(PointerButton::Primary),
-                ..
-            } => {
-                ctx.capture_pointer();
-                // Changes in pointer capture impact appearance, but not accessibility node
-                ctx.request_paint_only();
-                trace!("Button {:?} pressed", ctx.widget_id());
+            PointerEvent::Down { button, .. } => {
+                if *button == Some(PointerButton::Primary) {
+                    ctx.capture_pointer();
+                    // Changes in pointer capture impact appearance, but not accessibility node
+                    ctx.request_paint_only();
+                    trace!("Button {:?} pressed", ctx.widget_id());
+                }
+                // Any click event should lead to this widget getting focused.
+                ctx.request_focus();
             }
             PointerEvent::Up {
                 button: Some(PointerButton::Primary),
@@ -134,10 +135,6 @@ impl Widget for Button {
                 // Changes in pointer capture impact appearance, but not accessibility node
                 ctx.request_paint_only();
             }
-            PointerEvent::Down { .. } => {
-                // Any non-primary click event should lead to this widget getting focused.
-                ctx.request_focus();
-            }
             _ => (),
         }
     }

masonry/src/widgets/checkbox.rs

@@ -113,12 +113,15 @@ impl Widget for Checkbox {
         event: &PointerEvent,
     ) {
         match event {
-            PointerEvent::Down {
-                button: Some(PointerButton::Primary),
-                ..
-            } => {
-                ctx.capture_pointer();
-                trace!("Checkbox {:?} pressed", ctx.widget_id());
+            PointerEvent::Down { button, .. } => {
+                if *button == Some(PointerButton::Primary) {
+                    ctx.capture_pointer();
+                    // Checked state impacts appearance and accessibility node
+                    ctx.request_render();
+                    trace!("Checkbox {:?} pressed", ctx.widget_id());
+                }
+                // Any click event should lead to this widget getting focused.
+                ctx.request_focus();
             }
             PointerEvent::Up {
                 button: Some(PointerButton::Primary),
@@ -129,10 +132,6 @@ impl Widget for Checkbox {
                     trace!("Checkbox {:?} released", ctx.widget_id());
                 }
             }
-            PointerEvent::Down { .. } => {
-                // Any non-primary click event should lead to this widget getting focused.
-                ctx.request_focus();
-            }
             _ => (),
         }
     }