enrico
/
stiletto
1
1
Fork 0
Code Issues 27 Pull Requests 3 Releases Wiki Activity

Update to druid's pointer events branch #41

Open
enrico wants to merge 11 commits from pointer_events into master
pull from: pointer_events
merge into: enrico:master
Conversation 0 Commits 11 Files Changed 11 +2 -5
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c46a2bd66a - Show all commits

7
src/main.rs
View File

@ -24,10 +24,9 @@ use druid::widget::prelude::*;
use druid::widget::{ use druid::widget::{
Align, Button, Controller, CrossAxisAlignment, Flex, List, SizedBox, WidgetExt, Align, Button, Controller, CrossAxisAlignment, Flex, List, SizedBox, WidgetExt,
}; };
use druid::gesture::DruidGestureRecognizer;
use druid::{ use druid::{
AppDelegate, AppLauncher, Color, Command, Data, DelegateCtx, Env, FileDialogOptions, FileSpec, AppDelegate, AppLauncher, Color, Command, Data, DelegateCtx, Env, FileDialogOptions, FileSpec,
Handled, Lens, PointerEventPolicy, Target, WidgetId, WindowDesc, Handled, Lens, Target, WidgetId, WindowDesc,
}; };
use im::Vector; use im::Vector;
@ -38,9 +37,7 @@ use stiletto::widget::{build_simple_tool_widget, CanvasState, CanvasToolIconStat
use stiletto::DocumentSnapshot; use stiletto::DocumentSnapshot;
pub fn main() { pub fn main() {
let window = WindowDesc::new(build_ui) 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)) .window_size((1024.0, 1400.0))
.title(|data: &StilettoState, _env: &Env| { .title(|data: &StilettoState, _env: &Env| {
let doc_name = if let Some(path) = &data.current_file_path { let doc_name = if let Some(path) = &data.current_file_path {