From cdcc677c827b65e3c689d4207c0117f94e4d6d57 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Mon, 16 Jul 2012 16:27:58 -0700 Subject: Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug (left,top,width,height) changing it now changes the element on stage Signed-off-by: Kruti Shah --- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 57285704..9ae5d3d5 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html @@ -216,7 +216,9 @@ POSSIBILITY OF SUCH DAMAGE.
+
+
-- cgit v1.2.3 From 6403ec6d21048c93138ddcbcc59fc4677121ed5e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 19 Jul 2012 15:53:54 -0700 Subject: Timeline: updated livePreview to timeline play. Hide canvas and draw red outline - Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito --- .../Timeline/TimelinePanel.reel/TimelinePanel.html | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index c287e68e..0d769c23 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html @@ -54,7 +54,6 @@ POSSIBILITY OF SUCH DAMAGE. "playheadmarker": {"#": "playhead_marker"}, "timetext" : {"#": "time_text"}, "timebar" : {"#": "time_bar"}, - "container_tracks" : {"#" : "container-tracks"}, "end_hottext" : {"@" : "endHottext"}, "container_layers" : {"#" : "container-layers"}, "container_tracks" : {"#" : "container-tracks"}, @@ -62,8 +61,23 @@ POSSIBILITY OF SUCH DAMAGE. "checkable_animated" : {"#" : "checkable_animated"}, "tl_configbutton" : {"#" : "tl-configbutton"}, "checkable_lock" : {"#" : "checkable_lock"}, - "checkable_visible":{"#" : "checkable_visible"}, - "play_button" : {"#" : "play_button"} + "checkable_visible":{"#" : "checkable_visible"} + + } + }, + + "playButton": { + "prototype": "montage/ui/toggle-button.reel", + "properties": { + "element": {"#": "play_button"}, + "identifier": "playButton", + "pressedClass": "pausebutton", + "pressedLabel": "", + "unpressedLabel": "", + "pressed": false + }, + "bindings": { + "pressed": {"<->": "@owner.stage.timelinePlay"} } }, @@ -190,7 +204,7 @@ POSSIBILITY OF SUCH DAMAGE.
-
+
00:00:00
-- cgit v1.2.3