Commit Graph

136 Commits

Author SHA1 Message Date
jdescottes
21172249a3 Added fix for PreviewFilmController for very big piskels : limit DPI to 1 2013-08-05 23:55:19 +02:00
jdescottes
1977141076 Fixed size related issues. Selection Manager no longer depends on the frameoverlay which is now only manipulated by the tools 2013-08-05 23:34:11 +02:00
Julian Descottes
66d19cf9ca Merge pull request #112 from juliandescottes/fix-canvas-size-with-grid
Fix canvas size when grid display is active
2013-06-19 22:23:55 -07:00
jdescottes
a01afe2cfd Changed sortable items selector to a more robust one 2013-06-20 00:32:53 +02:00
jdescottes
07ced5a3b2 Exclude add-frame-button from sortable items in preview-film 2013-06-20 00:05:23 +02:00
Vince
4618cb643a Fix canvas size when grid display is active
- Dynamic resizing of canvas when display_grid is activated/deactivated
 - Adding a main-wrapper to get a perfect alignement at the top and
bottom the application screen
 - fix DPI update on page load (independent of grid option).
 - fix available width for DPI calculation (using margin-box, was using
only content before)
2013-06-19 19:01:12 +02:00
jdescottes
6cb145ae34 Merge branch 'master' into user-settings 2013-06-19 07:38:13 +02:00
jdescottes
0fe2e981b0 Reverted back to onchange due to lack of support of input range in firefox 21 2013-06-19 00:29:07 +02:00
Vince
5913b19641 Plug canvas background settings on UserSettings storage
Canvas background class are now manager at the FrameRenderer level
instead of CSS classes at the top of the DOM.
2013-06-17 23:10:35 +02:00
Vince
9eac3414a3 Clean grid code: semantic names and tiny refactor using UserSettings 2013-06-17 23:06:17 +02:00
Vince
9a3a87bd57 Fix travis 2013-06-17 21:03:22 +02:00
Vince
1d4ff1d2de Create an event based UserSettings and use it for the grid diplay state. 2013-06-17 20:24:27 +02:00
Vince
889d5c0d53 Add basic UserSettings persistence static utility.
Based on localStorage for now.
2013-06-17 19:54:43 +02:00
Vince
97ddc6ecc1 Adding simple backgorund picker (without persistence) 2013-06-17 11:36:56 +02:00
Vince
453f77cdd6 Nit: fix indentation 2013-06-17 10:37:08 +02:00
Vince
458f56f1ec Move toggling code to settingscontroller 2013-06-16 10:36:26 +02:00
Vince
955a49d2dd Adding SettingsController 2013-06-16 10:17:50 +02:00
Vince
765f75f255 Fix preview frames scrollers
They were not properly updated when content was re-becoming smaller
than the scroller.
2013-06-16 09:38:31 +02:00
Patrick Brosset
f6f02c7c1f correct slider init value and better FX slider event handling 2013-06-15 21:27:08 +02:00
Vince
13de7cbcfb New layout: application actions sticking to the right edge 2013-06-15 19:04:36 +02:00
Vince
92561db1c6 Fix contextmenu right click (active only above drawing canvas) 2013-06-14 13:18:26 +02:00
Vince
460c391326 Code cleanup + unsued images removal 2013-06-14 13:17:20 +02:00
Vince
2b18165f86 Fix scroller overflows apparitions 2013-06-13 23:20:51 +02:00
Vince
8b265bdb9b Adding overflow markers for preview frame scroller 2013-06-13 22:55:19 +02:00
Vince
9478055658 Move 'add frame button' to preview frames
and change UXD
2013-06-13 17:39:59 +02:00
Vince
f08f58328e Fix selected state for tools on load 2013-06-13 17:39:59 +02:00
Vince
5b0a8f157d Fixing DnD, removing LESS, cleaning code
- Updating DnD to use Sortable instead of draggable/dropppable
(updating deps as well).
- much simpler logic for DnD
- Remove LESS for now since it's a bit yet overkill
- fix moveFrame function
2013-06-13 00:04:39 +02:00
Vince
31062a70a9 proto init implementation + less 2013-06-12 14:53:47 +02:00
grosbouddha
fba6693426 Make jshint quiet now 2013-05-27 23:42:53 +02:00
jdescottes
9b40b11703 Support secondary color for color picker 2013-04-09 07:24:07 +02:00
grosbouddha
afe75c56bf Clean comments 2013-04-09 01:37:30 +02:00
grosbouddha
1441dcd67a Adding simple color picker
Left click colorpicker tool:
- Create PRIMARY/SECONDARY_COLOR_SELECTED/UPDATED events
- remove isPrimary arguments
2013-04-09 01:32:30 +02:00
juliandescottes
c7a8233adc Saving and reading FPS from model 2012-09-20 23:57:26 +02:00
juliandescottes
019df61cdc Fixed layout issue when hovering on non 32x32 tile previews 2012-09-20 23:01:49 +02:00
juliandescottes
016649bb46 Fixed overlap between drawing canvas and preview. 2012-09-16 23:34:00 +02:00
juliandescottes
8bee1fe4f3 Merge branch 'master' into add-dynamicsize 2012-09-16 23:27:00 +02:00
juliandescottes
0d1775b24c Dynamic size for frame 2012-09-16 18:48:32 +02:00
Vince
a4036e0f65 fix for real palette bug 2012-09-16 17:25:51 +02:00
Vince
324c2b464e Fix broken palette when swithcing tiles 2012-09-16 16:16:09 +02:00
Vince
362d8ef262 Prototypization of NotificationController 2012-09-16 14:41:47 +02:00
Vince
6d0b2eb9e2 merging with master 2012-09-16 14:24:03 +02:00
Vince
ca08d4b56a move notification to controller directory 2012-09-16 13:53:41 +02:00
Vince
5b9bc6edb1 Prototypization of PaletteController
I love new words
2012-09-16 13:50:40 +02:00
Vince
b671d46dbf moving palette.js to controller directory 2012-09-16 13:28:53 +02:00
Julian Descottes
3e7d576f7e Merge pull request #87 from grosbouddha/fix-pen-tools
UI cleanup
2012-09-15 22:50:26 -07:00
Vince
cfd5050901 UI cleanup 2012-09-16 04:33:26 +02:00
grosbouddha
01a522d485 Merge pull request #86 from grosbouddha/mirror-tool
Vertical mirror tool baby
2012-09-15 19:15:04 -07:00
Vince
b761750766 Renaming to VerticalMirrorPen 2012-09-16 00:52:39 +02:00
Vince
3afbf1c0e9 Comment & todo about rendering order of tool's icons 2012-09-16 00:48:53 +02:00
juliandescottes
2d8db76a5e Context menu needs to also be deactivated on the palette, to easily pick a previously used color as a secondary color. 2012-09-15 23:44:28 +02:00
Vince
df8f0a1996 Change ToolSelector to controller directory 2012-09-15 20:50:02 +02:00
juliandescottes
2edda09f08 Finalized first implementation of Circle tool 2012-09-14 23:43:49 +02:00
juliandescottes
ba6879875c Fixed dynamic dpi update for drawing canvas, added throttle on resize event. 2012-09-14 00:33:46 +02:00
Vince
e85fe32f02 Basic rectangular select tool basic 2012-09-13 22:57:32 +02:00
juliandescottes
3c9595c174 Display preview on init 2012-09-11 01:07:03 +02:00
juliandescottes
feadca9d1f Added clear method to pskl.model.Frame 2012-09-10 23:34:12 +02:00
juliandescottes
99e9cf8856 Fixed FilmPreview bugs. Simplified piskel.js, removed refernce to drawingController from tools 2012-09-10 23:34:11 +02:00
juliandescottes
12c9fececb Removed 2 useless instance variables in AnimatedPreviewController 2012-09-10 23:34:09 +02:00
juliandescottes
68c2cae658 Cleaned FrameRenderer.js FrameRenderer should also keep a reference on the frame it is updating - initially I wanted the renderer to be frame independant, but it doesnt bring much 2012-09-10 23:34:08 +02:00
Patrick Brosset
873a10caa2 Fix the duplication in the overlay when grid toggl
When the grid was toggled, the overlay would actually
draw the main drawing frame instead of just redrawing
itself with transparent pixels.
This was due to the drawingcontroller passing the ref
to the same frame object when initialiwing both
renders.

By the way, the overlay should probably be treated a
bit differently as redrawing all its transprent pixels
in that case is useless.
2012-09-10 23:34:06 +02:00
juliandescottes
63d8cd7eb7 Slight performance improvement, previewfilmcontroller still buggy 2012-09-09 01:12:54 +02:00
juliandescottes
2fa95fa1bc Added DrawingLoop.js and plugged basic rendering on each controller 2012-09-09 00:40:05 +02:00
juliandescottes
6e7545a1d2 Added drawing loop, unplugged traditional renderers 2012-09-08 23:59:44 +02:00
Vince
1a99fed64d pull/merge from master 2012-09-08 23:59:13 +02:00
Vince
f169a90644 Checkbox crappy styling and fixing overlayproxy grid 2012-09-08 23:53:59 +02:00
Vince
df945e10dd Add grid checkbox 2012-09-08 23:43:16 +02:00
Vince
6b9904935f Adding grid 2012-09-08 22:26:27 +02:00
Vince
82da78abf1 Adding grid 2012-09-08 22:26:17 +02:00
Vince
2cda69b000 Fixing remove and duplicate actions from previewfilm 2012-09-08 19:00:03 +02:00
Vince
6e8142bb3a Removing commented outdated code 2012-09-08 18:45:18 +02:00
Vince
9dc7afee61 Moving drawing canvas code from piskel.js to drawingController.js 2012-09-08 18:44:06 +02:00
juliandescottes
869f3d2e00 fixed bug when resizing 2012-09-08 17:57:21 +02:00
Vincent
bcd8cf07e6 Merge pull request #57 from grosbouddha/fix-dnd-canvas
Fixing DnD when dragging from canvas elements
2012-09-08 07:58:24 -07:00
Vince
5f451e3cf8 Fixing DnD when dragging from canvas elements 2012-09-08 16:56:07 +02:00
Vince
ba5500b4b0 Dynamic DPIs ! 2012-09-08 16:32:28 +02:00
Vince
bca16a3964 Creating renderingOptions object for FrameRenderer
Contains dpi, grid info, etc
2012-09-08 15:34:13 +02:00
Vince
9d5e2dc2d3 Merging dragndrop 2012-09-08 15:17:19 +02:00
Vince
eb7511c721 Encapsulate canvas element in FrameRenderer
From this change set, the HTML canvas element, which is the frame view,
is encapsulated inside the FrameRenderer.
You won't need to give the view handle from the controller layer
anymore.
It will make view alteration implementations much easier (like grid for
instance)
2012-09-08 15:08:00 +02:00
Vince
9411b2e3ae Moving (rendering related) DPI into FrameRenderer domain object 2012-09-08 12:24:55 +02:00
Vince
c66ce4c9ad Implementing interstitial tiles
Interstitial tiles are fake slides and allow us to insert drag n drop
tiles between two other.
2012-09-08 02:50:59 +02:00
Vince
1c1e0398e7 Drag'n drop fix when dropping outside the list 2012-09-07 23:25:38 +02:00
Vince
b824207d1d Dragndrop preview film tiles
- import go jquery-ui
- Basic implementation without styling
- only swapping is possible (no insertion)
2012-09-07 23:14:25 +02:00
juliandescottes
89be121dd1 Fixed animation preview when deleting 2012-09-05 00:42:25 +02:00
juliandescottes
53436009e3 Changed main-canvas to drawing-canvas 2012-09-05 00:13:45 +02:00
juliandescottes
1de9ee41b2 Finished first step of refactor. 2012-09-05 00:09:42 +02:00
juliandescottes
a567992a1d moved Frame and FrameSheet to model package 2012-09-04 22:40:54 +02:00