Commit graph

423 commits

Author SHA1 Message Date
Paul Davis
996a86f8a0 fix click/drag on ruler to *actually* locate rather than just fake locate, in the event of a click (no motion). 2014-09-29 13:38:15 -04:00
Paul Davis
638ace0b10 click (no motion) on punch bar locates playhead 2014-09-29 13:17:08 -04:00
Paul Davis
c6155db5ab click (no motion) on location marker locates transport 2014-09-29 13:14:08 -04:00
Paul Davis
01fa5ba3a2 use Waves' approach to GUI layout (pixel by pixel) to get vertical alignment in arrange area correct (or at least more correct) 2014-09-24 11:37:49 -04:00
Paul Davis
93cf0a7ccb more changes to get mouse interactions with markers + rulers closer to PRD 2014-09-23 16:54:54 -04:00
Paul Davis
ef54453554 clean up, fix up and generally improve marker/ruler dragging operations. 2014-09-23 15:16:33 -04:00
Paul Davis
cec1e08d33 when dragging regions across tracks, make the newly created region in the target track(s) have the same name as the original (and do not announce its creation since it effectively already exists 2014-09-23 12:22:26 -04:00
Paul Davis
0472453d94 many substantive changes in the handling of ARDOUR::Location, Markers and drags/clicks on Markers.
It would have been nice to split this commit into parts, but it is all very interconnected and was not possible to
subdivide.
2014-09-23 10:49:21 -04:00
Paul Davis
998375bbfd theme skip drag rect; remove some debug output 2014-09-23 10:49:21 -04:00
Paul Davis
2bff69b2fa skip markers respond to single-click by toggling skipping state 2014-09-21 17:38:48 -04:00
Paul Davis
42809db01d getting rulers/marker bars closer to PRD: add new ruler group, use new Marker API 2014-09-19 16:24:40 -04:00
nikolay
2792e9a26d [Summary] Fixed bug 42802. Removed region info panel on region double click.
[Reviewed] GZharun
2014-09-18 16:58:11 +03:00
Paul Davis
a95ec7ca5b various changes to accomodate skip markers (which span the entire range of an ARDOUR::Location) and to add drag-to-create-skip 2014-09-17 21:42:33 -04:00
Paul Davis
786f9fc59a new code to support creating skip markers 2014-09-17 16:29:36 -04:00
Ben Loftis
be2a3d6efc remove EditAtSelectedMarker for Mixbus, to match mb2. (also fix an existing thinko in the edit point selection actions) (oops: also fix previous track selection fix so that it pays attention to the selection property of the group) 2014-08-18 11:46:10 -04:00
Ben Loftis
7b41724c3d polish a few blemishes and add some comments 2014-08-17 20:48:41 -04:00
Ben Loftis
1ed1a23b6c fix range select so it picks up grouped tracks 2014-08-17 20:48:37 -04:00
Paul Davis
c95a9cd490 call Canvas::re_enter() at the end of a RegionCutDrag so that entered_regionview *might* be set 2014-08-17 20:44:58 -04:00
Paul Davis
806f3f9f15 cut cursor follows grid 2014-08-17 20:44:42 -04:00
Paul Davis
f246c98529 fix build after copy-n-paste/code change collision 2014-08-17 20:42:54 -04:00
Paul Davis
fca6419abf some code shuffling to make sure that cut mode always operates at the mouse location, with (maybe) the right regions 2014-08-17 20:42:47 -04:00
Paul Davis
e279a2c956 use an EditorCursor when dragging in cut mode to indicate cut position 2014-08-17 20:41:55 -04:00
Paul Davis
d93526de76 add functionality for cut tool 2014-08-17 20:41:15 -04:00
Ben Loftis
2b726333d1 if a Range end is trimmed, in follow-edits mode, locate to the range end so it can be auditioned. (same as trimming a region end) 2014-08-17 20:34:52 -04:00
Ben Loftis
2be8f11a3e fix the naming and behavior of always-play-range to match the button, which is follow-edits. when you select a range, the playhead should jump to the start of the range and begin to play the selection. BUT (unlike previous implementation) if the user wants to relocate the playhead, then that should be allowed. The user should always remain in charge of the playhead location. NOTE: your previous config setting will be invalidated. You must re-save a session to overwrite with the new config variable 2014-08-17 20:34:46 -04:00
Colin Fletcher
7e998402ea Ripple mode: ripple all after start of first selected region
Ripple drags should affect all regions which start at or after the
beginning of the first selected region, not just those which start after
its end.
2014-08-17 20:32:55 -04:00
Colin Fletcher
ba584c0901 Ripple mode: remove debug output
Remove std::cerr output, and tidy up a couple of comments.

Conflicts:
	gtk2_ardour/editor_drag.cc
2014-08-17 20:32:49 -04:00
Colin Fletcher
a8660f422f Fixes for ripple mode drag
Make undo of ripple mode dragging work a bit better, and hopefully prevent
rippled regions from jumping about when being dragged.

Conflicts:
	gtk2_ardour/editor_drag.cc
2014-08-17 20:31:57 -04:00
Paul Davis
12f081c358 use new TrackingText for verbose cursor
Conflicts:
	gtk2_ardour/editor_drag.cc
	gtk2_ardour/editor_mouse.cc
	gtk2_ardour/verbose_cursor.cc
	gtk2_ardour/verbose_cursor.h
2014-08-17 19:30:47 -04:00
Paul Davis
2f77f2bc69 removed no-longer-used Editor::track_canvas_motion()
Conflicts:
	gtk2_ardour/editor.h
2014-08-17 19:27:11 -04:00
Robin Gareus
a17616f1da move utility functions into a dedicated namespace
Conflicts:
	gtk2_ardour/about.cc
	gtk2_ardour/editor_ops.cc
2014-08-17 18:51:22 -04:00
Paul Davis
437a655026 fix broken manually merge conflict fix from earlier cherry-pick 2014-08-17 18:04:58 -04:00
Paul Davis
3be5f658ea use newly factored canvas in gtk2_ardour 2014-08-17 17:43:03 -04:00
Paul Davis
157512cce3 fix missed API changes in editor dragging code 2014-08-17 17:39:50 -04:00
Paul Davis
cca9f676a1 modifications to region drag implementation
(1) if we're dragging over the drop zone, then x-axis motion is irrelevant for threshold-of-move
(2) store original time axis view of a dragged region so that if we create a new track with the region drag, it can be the same height
2014-08-17 16:26:21 -04:00
Paul Davis
2e8f7c5c93 a set of inter-related subtle changes to get vertical autoscrolling to work, or at least work better. 2014-08-17 15:33:01 -04:00
Paul Davis
41526eec44 do most of the work related to adding new anchored trim cursors (but debugging/analysis continues) 2014-08-17 15:25:36 -04:00
Paul Davis
c5d29d59b5 rationalize and coordinate handle of region (time axis view item) opacity.
There are still some bugs with this because of the waveview image cache - fixes coming soon.

Conflicts:
	gtk2_ardour/time_axis_view_item.cc
2014-08-17 15:23:31 -04:00
Paul Davis
d89dd8e73a remove ambiguous use of Rect (on OS X) 2014-08-17 15:03:17 -04:00
Paul Davis
72d9c38702 substantial changes in color management, involving a reduction in the use of Gdk::Color and more consistent logic for region coloring.
Group tabs now also get the text drawn in an appropriately contrast-y color

Conflicts:
	gtk2_ardour/region_view.cc
	gtk2_ardour/time_axis_view_item.cc
2014-08-17 15:02:28 -04:00
Paul Davis
0ca808f222 allow a drag down over the drop zone to be "reversed" and the region moved back up into existing tracks 2014-08-17 15:00:17 -04:00
Paul Davis
678b836853 introduce Drag::_trackview_only which indicates that all y-axis positions for the pointer during a drag should be relative to the top of the trackview group.
More or less all drags except for Cursor (playhead) and drags in the range marker bars have this true (which is the default value)
2014-08-17 14:56:20 -04:00
Paul Davis
31834ac9b3 fix position where rubberband rect is drawn 2014-08-17 14:50:42 -04:00
Paul Davis
cb9c651639 fix up drawing and selection process for range selections (caused by subtle change in semantics of TimeAxisView::covered_by_y_range()) 2014-08-17 14:50:04 -04:00
Paul Davis
c64fcd2fc6 remove needlessly-added method 2014-08-17 14:49:52 -04:00
Paul Davis
983cbeba6f reinstate a canvas group where we reparent regions while dragging, so that they are always on top.
I mistakenly removed this during the onecanvas changes.
2014-08-17 14:49:44 -04:00
Paul Davis
dd2ada892a remove reference to region_motion_group, which no longer exists.
Not sure why git cherry-pick left this in place
2014-08-17 14:18:43 -04:00
Paul Davis
fdbb93ea3c merge onecanvas and cairocanvas branches, and manually resolve conflicts, including rounding in item_to_window() methods 2014-08-17 13:44:57 -04:00
Paul Davis
e8e3460665 more profound changes to canvas scrolling, in particular find appropriate ScrollGroup for Canvas::{window,canvas}_to_{canvas,window}()
Conflicts:
	gtk2_ardour/editor_mouse.cc
2014-08-17 13:43:52 -04:00
Paul Davis
893452b388 remove timebar canvas and just use a single canvas instead. This is just part one - lots of minor fixes to be done
Conflicts:
	gtk2_ardour/editor.cc
2014-08-17 13:38:30 -04:00