Skip to content

Commit

Permalink
Temporarily disable area selection (enso-org/ide#1318)
Browse files Browse the repository at this point in the history
Original commit: enso-org/ide@aeee0bc
  • Loading branch information
mwu-tow authored Mar 12, 2021
1 parent b6e9de1 commit 29aa4d1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
5 changes: 5 additions & 0 deletions ide/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
- [Fix issue with multiple instances of the IDE running.][1314]. This fixes an
issue where multiple instances of the IDE (or even other applications) could
lead to the IDE not working.
- [Disable area selection][1318]. The area selection was visible despite being
non-functional. To avoid confusion, area selection has been disabled until it
is [correctly implemented][479].

#### EnsoGL (rendering engine)

Expand All @@ -37,10 +40,12 @@ If you're interested in the enhancements and fixes made to the Enso compiler,
you can find their release notes
[here](https://github.com/enso-org/enso/blob/main/RELEASES.md).

[479]: https://github.com/enso-org/ide/issues/479
[1209]: https://github.com/enso-org/ide/pull/1209
[1291]: https://github.com/enso-org/ide/pull/1291
[1314]: https://github.com/enso-org/ide/pull/1314
[1316]: https://github.com/enso-org/ide/pull/1316
[1318]: https://github.com/enso-org/ide/pull/1318

<br/>

Expand Down
19 changes: 9 additions & 10 deletions ide/src/rust/ide/view/graph-editor/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2137,18 +2137,16 @@ fn new_graph_editor(app:&Application) -> GraphEditor {

// === Cursor Selection ===
frp::extend! { network

mouse_on_down_position <- mouse.position.sample(&mouse.down_primary);
selection_size_down <- mouse.position.map2(&mouse_on_down_position,|m,n|{m-n});
selection_size <- selection_size_down.gate(&touch.background.is_down);

on_press_style <- mouse.down_primary . constant(cursor::Style::new_press());
on_release_style <- mouse.up_primary . constant(cursor::Style::default());


cursor_selection_start <- selection_size.map(|p| cursor::Style::new_with_all_fields_default().press().box_selection(Vector2::new(p.x,p.y)));
cursor_selection_end <- mouse.up_primary . constant(cursor::Style::default());
cursor_selection <- any (cursor_selection_start, cursor_selection_end);
// FIXME [mwu] Restore when implementing https://github.com/enso-org/ide/issues/479
// mouse_on_down_position <- mouse.position.sample(&mouse.down_primary);
// selection_size_down <- mouse.position.map2(&mouse_on_down_position,|m,n|{m-n});
// selection_size <- selection_size_down.gate(&touch.background.is_down);
// cursor_selection_start <- selection_size.map(|p| cursor::Style::new_with_all_fields_default().press().box_selection(Vector2::new(p.x,p.y)));
// cursor_selection_end <- mouse.up_primary . constant(cursor::Style::default());
// cursor_selection <- any (cursor_selection_start, cursor_selection_end);

cursor_press <- any (on_press_style, on_release_style);

Expand Down Expand Up @@ -2950,7 +2948,8 @@ fn new_graph_editor(app:&Application) -> GraphEditor {

pointer_style <- all
[ pointer_on_drag
, cursor_selection
// FIXME [mwu] Restore when implementing https://github.com/enso-org/ide/issues/479
// , cursor_selection
, cursor_press
, node_pointer_style
, cursor_style_edge_drag
Expand Down

0 comments on commit 29aa4d1

Please sign in to comment.