summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_canvas_events.cc
AgeCommit message (Collapse)Author
2013-06-25Merge branch 'master' into cairocanvasPaul Davis
2013-06-21Make scroll-wheel modifier keys consistent in main editor window.Colin Fletcher
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-05-02merge resolution with masterPaul Davis
2013-04-30forward port recent mixbus change so that side-scroll is now shift-wheel and ↵Paul Davis
height adjustment is alt-wheel, rather than vice versa, to match OS X convention
2013-04-12manual translate events in Editor::track_canvas_scroll() to canvas space, ↵Paul Davis
because the event arrives there directly, not via the canvas. no other similar eventhandler in that code uses the event coordinates
2013-04-12leftmost_position => leftmost_sample, current_page_frames => ↵Paul Davis
current_page_samples
2013-04-12remove all unit-based methods from (Public)Editor; rationalize ↵Paul Davis
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-11Merge branch 'master' into cairocanvasRobin Gareus
Conflicts: gtk2_ardour/editor.h gtk2_ardour/editor_canvas.cc gtk2_ardour/wscript
2013-04-11enable videotimeline by defaultRobin Gareus
2013-04-04commit immediately post linkingPaul Davis
2013-04-04initial commit of hand merging, plus getting "ancient" waf script to work ↵Paul Davis
correctly
2013-03-29allow Drag-n-Drop onto the empty canvas (again); always import MIDI files ↵Paul Davis
since we consider them writable and so embedding isn't a safe option
2013-03-21honor CTRL modifier when drag/drop importing files (copy vs embed)Robin Gareus
2013-03-20fix an old bug introduced when cth tried (valiantly) to make region-list -> ↵Paul Davis
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-13videotimlineRobin Gareus
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2012-12-14mousing in a fade-out should fall through to the region, for now (this was ↵Ben Loftis
already done for fade-ins git-svn-id: svn://localhost/ardour2/branches/3.0@13668 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-13crossfade hack and slash. removed overlap checks, overlap mode, default ↵Ben Loftis
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-11-27mousehweel zoom should always operate like ZoomFocusMouseBen Loftis
git-svn-id: svn://localhost/ardour2/branches/3.0@13557 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-20Always Play Range is now Follow Edits, and is based on Mixbus ↵Ben Loftis
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-06-10Fix another place where regions can be inserted into aCarl Hetherington
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-05-24Remove over 500 unnecessary includes (including 54 of session.h).David Robillard
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-09skeleton for crossfade edge draggingPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@12235 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-08framework for handling events on the xfade rectsPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@12213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16Fairly major change to the way in which crossfades are handled;Carl Hetherington
they are now done with region fades, rather than separate objects. After this commit, Ardour will try to convert your session files to the new crossfade format, but will make a backup in your session folder first. If you have works in progress using Ardour 3 it is ***STRONGLY RECOMMENDED*** that you back up session files before updating to this commit. git-svn-id: svn://localhost/ardour2/branches/3.0@11986 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-02fix possible logic error and make logic line up with commentPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@11424 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27promote Playlist::RegionList to ARDOUR::RegionList; fix timefx on multiple ↵Paul Davis
regions, even regions of mixed type. this mostly involved some trivial code changes but to make the code simpler and less error prone, the API switched away from using RegionSelection (list of regionviews that catches regionviews vanishing) and used RegionList (lists of regions, no semantics) instead. git-svn-id: svn://localhost/ardour2/branches/3.0@11362 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04Use a few shared_ptrs to make things slightly neater.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@11156 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-31Slightly improve proxying of events by crossfade views; doesn't really have ↵Carl Hetherington
any positive effect, unfortunately. git-svn-id: svn://localhost/ardour2/branches/3.0@11127 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30fixes for 98% of all the warnings/errors reported by OS X gcc on tigerPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-15Delete key can now be used to remove tempo/meter markersPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@9996 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01Delete trailing whitespaceDavid Robillard
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-02Separate verbose cursor out into its own class and clean up the API. Fixes ↵Carl Hetherington
#4010. git-svn-id: svn://localhost/ardour2/branches/3.0@9455 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17Make sense of parameter to tav_zoom_step match up with coarser as used for ↵Carl Hetherington
temporal zoom. git-svn-id: svn://localhost/ardour2/branches/3.0@8896 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25Fix some messed up code (spacey tabs).David Robillard
(There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-21Updating zoom mouse cursor on modifier press. Fixes #274.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@7820 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17megaopus patch #2 for today: remove nframes64_t and sframes_t from sourcePaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags ↵Paul Davis
for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-02fix a variety of unused argument errors noted by gcc 4.3.2 on x86Paul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@7733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25check dependents in Playlist after moving a region to a specific layer; make ↵Paul Davis
region layering editor appear reliably; click on xfade sets clicked_routeview git-svn-id: svn://localhost/ardour2/branches/3.0@7692 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-06Fix up selection of automation points.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@7556 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-06beat slicing patch #1 from lincoln spiteriPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@7381 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05Set entered_regionview on entry into region view canvas item children. ↵Carl Hetherington
Should fix #3300. git-svn-id: svn://localhost/ardour2/branches/3.0@7372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-30Remove debug output.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@7331 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-29Fix vertical canvas autoscroll when dragging track heights. Fixes #3240.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@7327 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17add left/right side trim cursors and use them for region trimming, as ↵Paul Davis
appropriate git-svn-id: svn://localhost/ardour2/branches/3.0@7268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-30make trimming in region name (colored) highlight work even in internal edit ↵Paul Davis
mode; change enter/leave handler to return true by default (MIGHT HAVE UNINTENDED EFFECTS on mouse response), thus avoiding multiple stacked canvas items fighting over enter/leave git-svn-id: svn://localhost/ardour2/branches/3.0@7195 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28change color of note velocity text (and don't set it or justification ↵Paul Davis
repeatedly); make pianoroll button2 clicks select correctly rather than always being additive; hide note velocity text as soon as the mouse moves. the color change will require remvoing ~/.config/ardour2/ardour3_ui.conf to become effective git-svn-id: svn://localhost/ardour2/branches/3.0@7187 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28clean up item event handling in MidiRegionViews by removing unnecessary ↵Paul Davis
InteractiveItem inheritance, and keep child->parent event handling order consistent as much as possible git-svn-id: svn://localhost/ardour2/branches/3.0@7186 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05Small cleanups to dragging code. Fix assertion failure on dragging a ↵Carl Hetherington
regions' parent entry from the region list to the canvas (which may be #2811). Fixes to drags of regions onto and then back off canvas; should fix #3109. git-svn-id: svn://localhost/ardour2/branches/3.0@7068 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-01Remove some unused variables.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@7035 d708f5d6-7413-0410-9779-e7cbd77b26cf