Commit graph

20 commits

Author SHA1 Message Date
Rachel Fenichel
606fec56ca Decompose functions in core/zoom_controls.js 2018-04-26 12:29:12 -07:00
Rachel Fenichel
6275e1137c New dragging! Merge from google ()
Port of a major refactor from Blockly.  Dragging logic now lives in block_dragger.js, gesture.js, workspace_dragger.js, dragged_connection_manager.js (unused by scratch-blocks), and insertion_marker_manager.js (used only by scratch-blocks).
2017-05-22 13:08:22 -07:00
Andrew Sliwinski
292296af30 Implement new zoom controls. Resolves GH-43
* WIP: New zoom controls

* Adjust sizing as per discussion with Carl

* Update icons and spacing as per discussions with Carl

* Remove unused 'rnd' function

* Updated icons

* Resolve issues from PR review
2017-02-22 11:33:39 -05:00
Andrew Sliwinski
be9d5fefed Merge from Upstream Blockly ()
* WIP merge from upstream google/blockly

* fixing some merging bugs. Getting the drag surface to work, updating some function calls, etc.

* make the trash can lid animate again and fix the cursor to show an x when things will be removed.

* Fix text rendering logic in fields

* Hand apply some more changes from blockly flyout.js to flyout_base.js.

Also revert 08efd1381c
in scratch-blocks since it breaks variables and there is more work fenichel is planning
to do here.

* Fix drop-down field rendering

* Resolve issue with text input field widths on init

* Remove unused blockly (built) files

* Remove unused language files

* Resolve lint issues and rebuild

* Add blockly build targets to cleanup script

* Return 0 if 'this.arrow_' does not exist in a dropdown field

* Remove unused / irrelevant comments
2017-02-02 14:17:43 -05:00
Neil Fraser
4d65b606bd Set current workspace when clicking zoom controls. Issue 2016-10-23 06:38:04 -07:00
Neil Fraser
f8a916438c Resets zoom to startScale instead of 1. PR 2016-10-07 18:29:38 -07:00
Rachel Fenichel
ed983333eb bindEventWithChecks_ for internal use, and bindEvent_ with old behaviour but deprecated 2016-09-23 13:46:11 -07:00
Rachel Fenichel
b771d8daf4 Cleanup 2016-09-07 18:14:05 -07:00
Rachel Fenichel
109e4bb352 Move code to touch.js 2016-09-07 17:42:09 -07:00
Rachel Fenichel
1c025672b3 Clear touch identifier at the ends of more drags. Includes flyout background, right-clicks on blocks, and loading sounds. 2016-08-31 15:56:37 -07:00
Rachel Fenichel
a27fe99be4 Merge branch 'develop' into feature/horizontal_toolbox_port 2016-04-25 14:25:36 -07:00
Neil Fraser
fd7d4a2bef Make scrollCenter public, remove zoomReset. 2016-04-21 04:52:43 -07:00
rachel-fenichel
21e999678c correctly position trash can and zoom controls when the flyout is always open; add flyout and toolbox size to main workspace metrics; get rid of flyout's vertical offset. 2016-04-13 15:30:11 -07:00
rachel-fenichel
b22b25e8f8 correctly position the trash can and zoom controls for RTL, toolbox at left 2016-04-13 14:04:14 -07:00
Katelyn Mann
e39a0b7069 Add event preventDefault() calls to the end of zoom button handlers so the
browser doesn't try to handle them itself.  This keeps it from selecting text
on double clicks.
2016-04-11 15:33:05 -07:00
Neil Fraser
39fbd24659 Remove setProcedureParameters from API (use domToMutation instead). 2016-03-22 10:48:13 -07:00
Neil Fraser
890d8d8d73 Fix zoom center button. Reverse disconnect wiggle. 2015-09-22 17:28:51 -07:00
Neil Fraser
f9d47bd39e Lay out trashcan and zoom controls more flexibly. 2015-09-01 22:44:33 +01:00
carlosperate
466115d52b Revert DOM injection order of the zoom control images. 2015-08-21 20:51:35 +01:00
Neil Fraser
5b7fec7092 Add zooming feature.
By carloslfu.
2015-08-19 17:21:05 -07:00