Browse Source

Fix merge conflict

Jonathan Kelley 1 year ago
parent
commit
62a9583fff
2 changed files with 0 additions and 7 deletions
  1. 0 6
      packages/desktop/headless_tests/events.rs
  2. 0 1
      packages/desktop/src/lib.rs

+ 0 - 6
packages/desktop/headless_tests/events.rs

@@ -231,12 +231,6 @@ fn app(cx: Scope) -> Element {
                     assert!(event.data.held_buttons().is_empty());
                     assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Primary));
                     received_events.modify(|x| *x + 1)
-                },
-                    assert_eq!(
-                        event.data.trigger_button(),
-                        Some(dioxus_html::input_data::MouseButton::Primary),
-                    );
-                    recieved_events.modify(|x| *x + 1)
                 }
             }
             div {

+ 0 - 1
packages/desktop/src/lib.rs

@@ -147,7 +147,6 @@ pub fn launch_with_props<P: 'static>(root: Component<P>, props: P, cfg: Config)
             _ => {}
         }
 
-        // Update the control flow
         *control_flow = app.control_flow;
     })
 }