13
0
Commit Graph

163 Commits

Author SHA1 Message Date
452e39f8a3 Make horizontal scroll increment consistent in ruler and track canvas areas
In response to a comment in #6722, as there is little delineation between the
ruler and track canvas areas it makes sense to keep the scrolling step the same
to avoid unintended jumps in scrolling if mouse cursor moves between areas.
2016-01-25 17:44:22 +10:00
ab292183dd Bug #6722, Add UI config option to always use mouse position as zoom focus on scroll
This means that mouse zoom scrolling behaviour is consistent on the ruler
canvas area and track canvas area.

The config option defaults to true so this means the behaviour of Mixbus will
be unchanged but in Ardour the ruler area will now follow the option so by
default will use the mouse position as zoom focus when zooming rather than the
zoom focus setting.
2016-01-21 11:25:56 +10:00
6ba6cce799 Refactor code into Editor::temporal_zoom_step_mouse_focus method 2016-01-21 11:25:56 +10:00
72bdfc38a8 Fix/implement #6292, Shift + scroll wheel Scrolling in the ruler area
Keep the same scrolling distance per event as when scroll left/right is used.

Scrolling in the ruler area is different than the track canvas area which I'm
not sure is a great idea as there is not much delineation between the two areas
but as the ruler area has some other different behaviour it is probably
acceptable/useful.
2016-01-21 11:25:56 +10:00
08cbe0532c Refactor scrolling in Editor ruler canvas area into two utility methods 2016-01-21 11:25:56 +10:00
743e324c6a Remove goto in Editor::track_canvas_scroll 2016-01-21 11:25:56 +10:00
c6805c1454 Refactor scrolling track canvas in Editor class into two utility methods 2016-01-21 11:25:55 +10:00
André Nusser
5f7ae1294e Fix zooming via ctrl+scroll in midi regions when note is selected. 2015-12-07 17:58:58 -05:00
22b07e0233 NOOP, remove trailing tabs/whitespace. 2015-10-05 16:17:49 +02:00
4dc63966f0 globally remove all trailing whitespace from ardour code base.
Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
6b019a4953 Move UIConfiguration Singleton into UIConfiguration header
This removes the direct dependence on ardour_ui.h from 39 files
2015-09-16 16:55:17 -04:00
nick_m
1963c3ff10 Allow creation of region gain points by clicking on a line.
- Also fixes new AutomationLine points having huge offsets
	  on creation via line click (window vs canvas event sample).
2015-08-27 02:20:43 +10:00
e1f168de11 rename Marker class
Classes are in the global namespace.
OSX has a flat namespace and OSX32bit/Carbon has a Marker too.
2015-07-23 17:58:40 +02:00
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
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
9696469289 implement drags from off-canvas to the drop-zone.
fixes #6195 #6205
2015-03-25 01:48:29 +01:00
f603ca174e in mixbus, treat the canvas rulers just like the canvas wrt mouse-wheel-zoom 2015-01-29 11:23:49 -06:00
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
64fa63212f move all (G)UI related configuration parameters into UIConfiguration, not RCConfiguration 2014-12-22 13:39:46 -05:00
b73f725676 remove mouse zoom mode; bind z to zoom-to-range 2014-10-21 12:47:53 -04:00
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
acc1977cbd vertical scroll events should move by tracks 2014-07-14 12:36:51 -04:00
e3a6ea0273 give drop zone its own cursor-ability 2014-07-01 14:37:05 -04:00
7b8fd17719 make canvas drop sensitive to scroll events 2014-06-30 14:47:57 -04:00
be37432bef removed no-longer-used Editor::track_canvas_motion() 2014-06-26 15:10:24 -04:00
7ebf107e43 fix y-offset when drag-n-dropping regions from region list 2014-06-25 12:40:11 -04:00
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
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
902e202f3e disambiguate another use of Rect on OS X 2014-06-13 15:48:30 -04:00
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
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
ea355bfe15 add canvas rulers event dispatch and reinstate scrolling behaviour 2014-06-12 15:58:05 -04:00
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
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
4843c5d5cf towards region-trims preserving fade duration 2014-05-31 03:53:59 +02:00
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
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
d01075afcc tweak for regionview enter/exit handling 2013-12-12 20:44:28 -05:00
7bbd28aa08 notable changes to try to improve most of enter/leave handling for canvas items 2013-10-30 23:36:30 -04:00
3031a99364 Merge branch 'master' into cairocanvas 2013-06-25 22:24:47 -04:00
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
e2f0c5f91e merge resolution with master 2013-05-02 20:21:54 -04:00
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
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
8877199ae0 leftmost_position => leftmost_sample, current_page_frames => current_page_samples 2013-04-12 11:21:12 -04:00
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
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