#include "ardour_ui.h"
#include "actions.h"
+#include "canvas-note.h"
#include "editor.h"
#include "time_axis_view.h"
#include "audio_time_axis.h"
c = grabber_edit_point_cursor;
break;
default:
+ boost::shared_ptr<Movable> m = _movable.lock();
+ if (m && m->locked()) {
+ c = speaker_cursor;
+ }
break;
}
}
return c;
}
+void
+Editor::set_current_trimmable (boost::shared_ptr<Trimmable> t)
+{
+ boost::shared_ptr<Trimmable> st = _trimmable.lock();
+
+ if (!st || st == t) {
+ _trimmable = t;
+ set_canvas_cursor ();
+ }
+
+}
+
+void
+Editor::set_current_movable (boost::shared_ptr<Movable> m)
+{
+ boost::shared_ptr<Movable> sm = _movable.lock();
+
+ if (!sm || sm != m) {
+ _movable = m;
+ set_canvas_cursor ();
+ }
+}
+
void
Editor::set_canvas_cursor ()
{
break;
case MouseZoom:
- current_canvas_cursor = zoom_cursor;
+ if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
+ current_canvas_cursor = zoom_out_cursor;
+ } else {
+ current_canvas_cursor = zoom_in_cursor;
+ }
break;
case MouseTimeFX:
}
}
- if (is_drawable()) {
- track_canvas->get_window()->set_cursor(*current_canvas_cursor);
- }
+ set_canvas_cursor (current_canvas_cursor, true);
}
void
case NoteItem:
if (internal_editing()) {
/* trim notes if we're in internal edit mode and near the ends of the note */
- _drags->set (new NoteResizeDrag (this, item), event);
+ ArdourCanvas::CanvasNote* cn = dynamic_cast<ArdourCanvas::CanvasNote*> (item);
+ cerr << "NoteItem button press, cursor = " << current_canvas_cursor << endl;
+ if (cn->mouse_near_ends()) {
+ _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
+ } else {
+ _drags->set (new NoteDrag (this, item), event);
+ }
}
return true;
case StreamItem:
- cerr << "press on stream item, internal? " << internal_editing() << " MIDI ? "
- << dynamic_cast<MidiTimeAxisView*>(clicked_axisview)
- << endl;
if (internal_editing()) {
if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
_drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
case RegionViewNameHighlight:
case LeftFrameHandle:
case RightFrameHandle:
- {
- RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
- _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event);
- return true;
+ if (!clicked_regionview->region()->locked()) {
+ RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
+ _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event);
+ return true;
+ }
break;
- }
default:
if (!internal_editing()) {
switch (item_type) {
case NoteItem:
if (internal_editing()) {
- _drags->set (new NoteDrag (this, item), event);
+ ArdourCanvas::CanvasNote* cn = dynamic_cast<ArdourCanvas::CanvasNote*> (item);
+ if (cn->mouse_near_ends()) {
+ _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
+ } else {
+ _drags->set (new NoteDrag (this, item), event);
+ }
return true;
}
break;
*/
break;
}
+
+ if (internal_editing ()) {
+ /* no region drags in internal edit mode */
+ break;
+ }
/* click on a normal region view */
if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
case RegionViewNameHighlight:
case LeftFrameHandle:
case RightFrameHandle:
- if (!internal_editing ()) {
+ if (!internal_editing () && !clicked_regionview->region()->locked()) {
RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
_drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event);
return true;
case MouseTimeFX:
if (internal_editing() && item_type == NoteItem) {
/* drag notes if we're in internal edit mode */
- _drags->set (new NoteResizeDrag (this, item), event);
+ _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
return true;
} else if ((!internal_editing() || dynamic_cast<AudioRegionView*> (clicked_regionview)) && clicked_regionview) {
/* do time-FX if we're not in internal edit mode, or we are but we clicked on an audio region */
scrub_reverse_distance = 0;
last_scrub_x = event->button.x;
scrubbing_direction = 0;
- track_canvas->get_window()->set_cursor (*transparent_cursor);
+ set_canvas_cursor (transparent_cursor);
return true;
break;
}
}
+ pre_press_cursor = current_canvas_cursor;
+
track_canvas->grab_focus();
if (_session && _session->actively_recording()) {
framepos_t where = event_frame (event, 0, 0);
AutomationTimeAxisView* atv = 0;
+ if (pre_press_cursor) {
+ set_canvas_cursor (pre_press_cursor);
+ pre_press_cursor = 0;
+ }
+
/* no action if we're recording */
if (_session && _session->actively_recording()) {
were_dragging = true;
}
- update_region_layering_order_editor (where);
+ update_region_layering_order_editor ();
/* edit events get handled here */
if (!_drags->active () && Keyboard::is_edit_event (&event->button)) {
switch (item_type) {
case RegionItem:
- edit_region ();
+ show_region_properties ();
break;
case TempoMarkerItem:
break;
case MouseAudition:
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
if (scrubbing_direction == 0) {
/* no drag, just a click */
switch (item_type) {
fraction = 1.0 - (cp->get_y() / cp->line().height());
if (is_drawable() && !_drags->active ()) {
- track_canvas->get_window()->set_cursor (*fader_cursor);
+ set_canvas_cursor (fader_cursor);
}
set_verbose_canvas_cursor (cp->line().get_verbose_cursor_string (fraction), at_x, at_y);
if (line)
line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredGainLine.get();
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*fader_cursor);
+ set_canvas_cursor (fader_cursor);
}
}
break;
line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredAutomationLine.get();
}
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*fader_cursor);
+ set_canvas_cursor (fader_cursor);
}
}
break;
case RegionViewNameHighlight:
if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) {
- track_canvas->get_window()->set_cursor (*trimmer_cursor);
+ set_canvas_cursor (trimmer_cursor);
}
break;
case LeftFrameHandle:
if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) {
- track_canvas->get_window()->set_cursor (*left_side_trim_cursor);
+ if (entered_regionview) {
+ Trimmable::CanTrim ct = entered_regionview->region()->can_trim();
+ if ((ct & Trimmable::EndTrimEarlier) || (ct & Trimmable::EndTrimLater)) {
+ set_canvas_cursor (left_side_trim_cursor);
+ }
+ }
}
break;
case RightFrameHandle:
if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) {
- track_canvas->get_window()->set_cursor (*right_side_trim_cursor);
+ if (entered_regionview) {
+ Trimmable::CanTrim ct = entered_regionview->region()->can_trim();
+ if ((ct & Trimmable::FrontTrimEarlier) || (ct & Trimmable::FrontTrimLater)) {
+ set_canvas_cursor (right_side_trim_cursor);
+ }
+ }
}
break;
#endif
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*trimmer_cursor);
+ set_canvas_cursor (trimmer_cursor);
}
break;
if (is_drawable()) {
switch (_edit_point) {
case EditAtMouse:
- track_canvas->get_window()->set_cursor (*grabber_edit_point_cursor);
+ set_canvas_cursor (grabber_edit_point_cursor);
break;
default:
- track_canvas->get_window()->set_cursor (*grabber_cursor);
+ set_canvas_cursor (grabber_cursor);
break;
}
}
if (!reinterpret_cast<RegionView *> (item->get_data ("regionview"))->name_active()) {
if (mouse_mode == MouseObject && is_drawable()) {
- track_canvas->get_window()->set_cursor (*trimmer_cursor);
+ set_canvas_cursor (trimmer_cursor);
}
}
break;
cursor = selector_cursor;
break;
case MouseZoom:
- cursor = zoom_cursor;
+ cursor = zoom_in_cursor;
break;
default:
cursor = cross_hair_cursor;
break;
}
- track_canvas->get_window()->set_cursor (*cursor);
+ set_canvas_cursor (cursor);
AutomationTimeAxisView* atv;
if ((atv = static_cast<AutomationTimeAxisView*>(item->get_data ("trackview"))) != 0) {
case MeterBarItem:
case TempoBarItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*timebar_cursor);
+ set_canvas_cursor (timebar_cursor);
}
break;
case MeterMarkerItem:
case TempoMarkerItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*timebar_cursor);
+ set_canvas_cursor (timebar_cursor);
}
break;
if (rect) {
rect->property_fill_color_rgba() = 0xBBBBBBAA;
}
- track_canvas->get_window()->set_cursor (*fade_in_cursor);
+ set_canvas_cursor (fade_in_cursor);
}
break;
if (rect) {
rect->property_fill_color_rgba() = 0xBBBBBBAA;
}
- track_canvas->get_window()->set_cursor (*fade_out_cursor);
+ set_canvas_cursor (fade_out_cursor);
}
break;
case FeatureLineItem:
}
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
hide_verbose_canvas_cursor ();
#endif
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
break;
line->property_fill_color_rgba() = al->get_line_color();
}
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
break;
/* see enter_handler() for notes */
if (!reinterpret_cast<RegionView *> (item->get_data ("regionview"))->name_active()) {
if (is_drawable() && mouse_mode == MouseObject) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
}
break;
case TempoBarItem:
case MarkerBarItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
break;
case TempoMarkerItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*timebar_cursor);
+ set_canvas_cursor (timebar_cursor);
}
break;
rect->property_outline_pixels() = 0;
}
}
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
break;
case AutomationTrackItem:
if (is_drawable()) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
clear_entered_track = true;
Glib::signal_idle().connect (sigc::mem_fun(*this, &Editor::left_automation_track));
}
double cy = y;
rtv->canvas_display()->w2i (cx, cy);
- bool const top_half = cy < rtv->current_height () / 2;
-
- _join_object_range_state = top_half ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
+ double const c = cy / rtv->view()->child_height();
+ double d;
+ double const f = modf (c, &d);
+
+ _join_object_range_state = f < 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
}
}
}
projects / ardour.git / blobdiff