Commit graph

150 commits

Author SHA1 Message Date
nick_m
d9c0aa4236 Amend last commit. 2015-06-22 00:53:31 +10:00
nick_m
d45a25e4a8 Clicking an automation track line without a move adds a point on the line. 2015-06-22 00:47:08 +10:00
Robin Gareus
9242ca7a64 dropzone: honor AutoConnectMaster. 2015-03-27 19:22:21 +01:00
nick_m
1580c6d635 Fix some strings incorrectly marked for translation.
My apologies to translators.
2015-03-25 23:31:23 +11:00
Robin Gareus
9696469289 implement drags from off-canvas to the drop-zone.
fixes #6195 #6205
2015-03-25 01:48:29 +01:00
Ben Loftis
f603ca174e in mixbus, treat the canvas rulers just like the canvas wrt mouse-wheel-zoom 2015-01-29 11:23:49 -06:00
Paul Davis
0f46d7b107 ignore context menu click events, notably during drag but also for a couple of other purposes
Conflicts:
	gtk2_ardour/editor_canvas_events.cc
2015-01-26 16:39:22 -05:00
nick_m
44203ce955 Fix AutomationTrackItem rubberband click thinking it was unhandled.
Fix several other cases where a single mouse click could cause several
(not nested) selection ops.
Fix missing selection memento for midi notes and midi commands.
Rename some variables.
Fix random style issues.
2015-01-11 04:07:31 +11:00
Paul Davis
64fa63212f move all (G)UI related configuration parameters into UIConfiguration, not RCConfiguration 2014-12-22 13:39:46 -05:00
Paul Davis
b73f725676 remove mouse zoom mode; bind z to zoom-to-range 2014-10-21 12:47:53 -04:00
Robin Gareus
31b033f0d2 fix region drag/drop from region list
The canvas’ Y-offset (rulers & scroll) needs to be subtracted here.
2014-10-21 11:46:15 +02:00
Paul Davis
acc1977cbd vertical scroll events should move by tracks 2014-07-14 12:36:51 -04:00
Paul Davis
e3a6ea0273 give drop zone its own cursor-ability 2014-07-01 14:37:05 -04:00
Paul Davis
7b8fd17719 make canvas drop sensitive to scroll events 2014-06-30 14:47:57 -04:00
Paul Davis
be37432bef removed no-longer-used Editor::track_canvas_motion() 2014-06-26 15:10:24 -04:00
Paul Davis
7ebf107e43 fix y-offset when drag-n-dropping regions from region list 2014-06-25 12:40:11 -04:00
Paul Davis
b46652c3c9 button click (release, to be precise) within the canvas drop zone cancels all object and track selections 2014-06-22 15:24:26 -04:00
Paul Davis
becf857f48 a whole slew of changes related to centralizing and rationalizing cursor management.
Debugging output left in place to help address the reports that will come in as people test this more
2014-06-18 10:24:59 -04:00
Paul Davis
902e202f3e disambiguate another use of Rect on OS X 2014-06-13 15:48:30 -04:00
Paul Davis
7a0b2e1c18 fix scrolling behaviour in track headers (event was stolen by rulers because event coordinates made it look as if the event happened there) 2014-06-13 14:27:59 -04:00
Paul Davis
720a9b73a5 fixed rulers stealing all canvas scroll events and corrected computation of correct track for track-height adjustment using alt-scroll 2014-06-12 17:21:23 -04:00
Paul Davis
ea355bfe15 add canvas rulers event dispatch and reinstate scrolling behaviour 2014-06-12 15:58:05 -04:00
Paul Davis
d36afa6b8b forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is) 2014-06-09 10:02:38 -04:00
Paul Davis
b530e8649e rename Editor::_canvas_bottom_rect as Editor::_canvas_drop_zone; increase its size; remove debug message 2014-06-09 09:09:21 -04:00
Robin Gareus
4843c5d5cf towards region-trims preserving fade duration 2014-05-31 03:53:59 +02:00
Paul Davis
5668eea2a3 add a transparent rect that is always located at the bottom of the track canvas
This gives us an event/drag-n-drop/click target for things "at the bottom"
2014-04-16 04:16:56 -04:00
Paul Davis
c04285addf convert canvas_event_frame() and window_event_frame() to canvas_event_sample() and window_event_sample() to go along with the convention adopted in cairocanvas code re: frames+samples 2014-02-26 08:43:53 -05:00
Paul Davis
d01075afcc tweak for regionview enter/exit handling 2013-12-12 20:44:28 -05:00
Paul Davis
7bbd28aa08 notable changes to try to improve most of enter/leave handling for canvas items 2013-10-30 23:36:30 -04:00
Paul Davis
3031a99364 Merge branch 'master' into cairocanvas 2013-06-25 22:24:47 -04:00
Colin Fletcher
21914c884e Make scroll-wheel modifier keys consistent in main editor window.
Add constants for the keyboard modifiers that should be used for vertical
zoom, horizontal zoom, and horizontal scrolling in the main editor window,
and use these where appropriate rather than using Keyboard::PrimaryModifier
and friends directly.
2013-06-21 20:13:44 +01:00
Paul Davis
e2f0c5f91e merge resolution with master 2013-05-02 20:21:54 -04:00
Paul Davis
35842fd5ee forward port recent mixbus change so that side-scroll is now shift-wheel and height adjustment is alt-wheel, rather than vice versa, to match OS X convention 2013-04-30 16:38:48 -04:00
Paul Davis
41f63fc61a manual translate events in Editor::track_canvas_scroll() to canvas space, because the event arrives there directly, not via the canvas. no other similar eventhandler in that code uses the event coordinates 2013-04-12 18:00:46 -04:00
Paul Davis
8877199ae0 leftmost_position => leftmost_sample, current_page_frames => current_page_samples 2013-04-12 11:21:12 -04:00
Paul Davis
ecfd2a7455 remove all unit-based methods from (Public)Editor; rationalize Editor::event_frame() to clearly identify whether the passed-in GdkEvent has window units or canvas units (the latter will be true for all events that are handled by the canvas and then passed to Editor 2013-04-12 11:09:49 -04:00
Robin Gareus
6ae4f10437 Merge branch 'master' into cairocanvas
Conflicts:
	gtk2_ardour/editor.h
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/wscript
2013-04-11 22:24:05 +02:00
Robin Gareus
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
Paul Davis
19bd641915 commit immediately post linking 2013-04-04 18:45:27 -04:00
Paul Davis
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
Paul Davis
197e75ab80 allow Drag-n-Drop onto the empty canvas (again); always import MIDI files since we consider them writable and so embedding isn't a safe option 2013-03-29 14:09:03 -04:00
Robin Gareus
268553ecd4 honor CTRL modifier when drag/drop importing files (copy vs embed) 2013-03-21 21:33:02 +01:00
Paul Davis
7b998ceba1 fix an old bug introduced when cth tried (valiantly) to make region-list -> DnD -> canvas behave like a regular region drag. this doesnt' work because the RegionInsertDrag() grabs the mouse and breaks the DnD. in addition, the code failed to correctly indicate when a drop was possible (over a Track) and when it was not (over a Bus) - this has also been fixed. the actual code in Editor::drop_regions() could and should be simplified - no reason to use a RegionInsertDrag here, but it was fast 2013-03-20 17:33:25 -04:00
Robin Gareus
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
Ben Loftis
e5776d1a69 mousing in a fade-out should fall through to the region, for now (this was already done for fade-ins
git-svn-id: svn://localhost/ardour2/branches/3.0@13668 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-14 17:02:36 +00:00
Ben Loftis
2292e33ee4 crossfade hack and slash. removed overlap checks, overlap mode, default length, fade_is_xfade, fade_is_short, and other leftovers from previous crossfade models. Draw crossfade drags in realtime so fade_line is no longer needed. remove code for hiding crossfades during a drag. moved crossfade rect to top layer so crossfade lines dont grab mouse focus. drag-trim-with-fixed-fade-anchor is partially implemented and needs discussion
git-svn-id: svn://localhost/ardour2/branches/3.0@13659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-13 16:42:05 +00:00
Ben Loftis
f23490bd37 mousehweel zoom should always operate like ZoomFocusMouse
git-svn-id: svn://localhost/ardour2/branches/3.0@13557 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-27 17:04:42 +00:00
Ben Loftis
beb3ec2d7a Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly
git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-20 19:43:43 +00:00
Carl Hetherington
df6222b3b4 Fix another place where regions can be inserted into a
playlist without also getting put into the master list.


git-svn-id: svn://localhost/ardour2/branches/3.0@12646 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-10 14:42:22 +00:00
David Robillard
6fa6514cfd Remove over 500 unnecessary includes (including 54 of session.h).
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff).  I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.

This commit only targets includes of ardour/*.h.  There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.


git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 06:09:29 +00:00