smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-21 22:26:29 +01:00
Code Issues Projects Releases Wiki Activity

rename Editor::_canvas_bottom_rect as Editor::_canvas_drop_zone; increase its size; remove debug message

Browse source
This commit is contained in:
Paul Davis 2014-06-09 09:09:21 -04:00
parent c5152cfdb3
commit e81e6841ff
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor.h
View file

@ -761,8 +761,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
/* a rect that sits at the bottom of all tracks to act as a drag-no-drop/clickable /* a rect that sits at the bottom of all tracks to act as a drag-no-drop/clickable
* target area. * target area.
*/ */
ArdourCanvas::Rectangle* _canvas_bottom_rect; ArdourCanvas::Rectangle* _canvas_drop_zone;
bool canvas_bottom_rect_event (GdkEvent* event); bool canvas_drop_zone_event (GdkEvent* event);
enum RulerType { enum RulerType {
ruler_metric_timecode = 0, ruler_metric_timecode = 0,

14
gtk2_ardour/editor_canvas.cc
View file

@ -226,11 +226,11 @@ Editor::initialize_canvas ()
} }
_canvas_bottom_rect = new ArdourCanvas::Rectangle (hv_scroll_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, 20)); _canvas_drop_zone = new ArdourCanvas::Rectangle (hv_scroll_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, 0.0));
/* this thing is transparent */ /* this thing is transparent */
_canvas_bottom_rect->set_fill (false); _canvas_drop_zone->set_fill (false);
_canvas_bottom_rect->set_outline (false); _canvas_drop_zone->set_outline (false);
_canvas_bottom_rect->Event.connect (sigc::mem_fun (*this, &Editor::canvas_bottom_rect_event)); _canvas_drop_zone->Event.connect (sigc::mem_fun (*this, &Editor::canvas_drop_zone_event));
/* these signals will initially be delivered to the canvas itself, but if they end up remaining unhandled, they are passed to Editor-level /* these signals will initially be delivered to the canvas itself, but if they end up remaining unhandled, they are passed to Editor-level
handlers. handlers.
@ -286,6 +286,8 @@ Editor::track_canvas_viewport_size_allocated ()
_visible_canvas_width = _canvas_viewport_allocation.get_width (); _visible_canvas_width = _canvas_viewport_allocation.get_width ();
_visible_canvas_height = _canvas_viewport_allocation.get_height (); _visible_canvas_height = _canvas_viewport_allocation.get_height ();
_canvas_drop_zone->set_y1 (_canvas_drop_zone->y0() + _visible_canvas_height);
// SHOWTRACKS // SHOWTRACKS
if (height_changed) { if (height_changed) {
@ -340,13 +342,13 @@ Editor::reset_controls_layout_height (int32_t h)
* (the drag-n-drop zone) is, in fact, at the bottom. * (the drag-n-drop zone) is, in fact, at the bottom.
*/ */
_canvas_bottom_rect->set_position (ArdourCanvas::Duple (0, h)); _canvas_drop_zone->set_position (ArdourCanvas::Duple (0, h));
/* track controls layout must span the full height of "h" (all tracks) /* track controls layout must span the full height of "h" (all tracks)
* plus the bottom rect. * plus the bottom rect.
*/ */
h += _canvas_bottom_rect->height (); h += _canvas_drop_zone->height ();
/* set the height of the scrollable area (i.e. the sum of all contained widgets) /* set the height of the scrollable area (i.e. the sum of all contained widgets)
* for the controls layout. The size request is set elsewhere. * for the controls layout. The size request is set elsewhere.

3
gtk2_ardour/editor_canvas_events.cc
View file

@ -1010,9 +1010,8 @@ Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item)
} }
bool bool
Editor::canvas_bottom_rect_event (GdkEvent* event) Editor::canvas_drop_zone_event (GdkEvent* event)
{ {
cerr << "CBR event, type " << event << endl;
return true; return true;
} }