From 24ddfcd0a6207f23df3de6eeeba9ec7e2c9f5144 Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Fri, 23 Jul 2021 00:11:51 +0200 Subject: [PATCH] WIP (druid) --- src/main.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 5c34604..9fadd1f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -24,10 +24,10 @@ use druid::widget::prelude::*; use druid::widget::{ Align, Button, Controller, CrossAxisAlignment, Flex, List, SizedBox, WidgetExt, }; -use druid::gesture::GestureController; +use druid::gesture::DruidGestureRecognizer; use druid::{ AppDelegate, AppLauncher, Color, Command, Data, DelegateCtx, Env, FileDialogOptions, FileSpec, - Handled, Lens, PointerEventController, PointerEventPolicy, Target, WidgetId, WindowDesc, + Handled, Lens, PointerEventPolicy, Target, WidgetId, WindowDesc, }; use im::Vector; @@ -39,6 +39,8 @@ use stiletto::DocumentSnapshot; pub fn main() { let window = WindowDesc::new(build_ui) + .set_pointer_event_policy(PointerEventPolicy::UseMixedApi) + .set_gesture_recognizer(Box::new(DruidGestureRecognizer::new())) .window_size((1024.0, 1400.0)) .title(|data: &StilettoState, _env: &Env| { let doc_name = if let Some(path) = &data.current_file_path { @@ -201,7 +203,6 @@ fn build_ui() -> impl Widget { 1.0, ) .controller(ToolSwitcher::new()) - .controller(GestureController::new()) } struct ToolSwitcher {