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 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 24ddfcd0a6 - Show all commits

7
src/main.rs
View File

@ -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<StilettoState> {
1.0,
)
.controller(ToolSwitcher::new())
.controller(GestureController::new())
}
struct ToolSwitcher {