using Gtkmm2ext::Keyboard;
const double trim_handle_size = 6.0; /* pixels */
-uint32_t TimeAxisView::extra_height;
-uint32_t TimeAxisView::small_height;
+uint32_t TimeAxisView::button_height = 0;
+uint32_t TimeAxisView::extra_height = 0;
int const TimeAxisView::_max_order = 512;
PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
name_hbox.show ();
controls_table.set_size_request (200);
- controls_table.set_row_spacings (0);
- controls_table.set_col_spacings (0);
+ controls_table.set_row_spacings (2);
+ controls_table.set_col_spacings (2);
+ controls_table.set_border_width (2);
controls_table.set_homogeneous (true);
controls_table.attach (name_hbox, 0, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0);
Gdk::SCROLL_MASK);
controls_ebox.set_flags (CAN_FOCUS);
+ /* note that this handler connects *before* the default handler */
controls_ebox.signal_scroll_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
controls_ebox.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_press));
controls_ebox.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
bool
TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
{
- if (Keyboard::some_magic_widget_has_focus()) {
- return false;
- }
-
switch (ev->direction) {
case GDK_SCROLL_UP:
if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
controls_ebox.translate_coordinates (*control_parent, ev->x, ev->y, tx, ty);
ev->y = ty - _editor.get_trackview_group_vertical_offset();
_editor.drags()->motion_handler ((GdkEvent *) ev, false);
- _editor.maybe_autoscroll (false, true);
+ _editor.maybe_autoscroll (false, true, false, ev->y_root < _resize_drag_start);
/* now do the actual TAV resize */
int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start);
}
bool
-TimeAxisView::controls_ebox_leave (GdkEventCrossing* ev)
+TimeAxisView::controls_ebox_leave (GdkEventCrossing*)
{
if (_have_preresize_cursor) {
gdk_window_set_cursor (controls_ebox.get_window()->gobj(), _preresize_cursor);
name_entry_changed ();
TrackViewList const & allviews = _editor.get_track_views ();
TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this);
+
if (ev->keyval == GDK_Tab) {
if (i != allviews.end()) {
do {
if (++i == allviews.end()) {
return true;
}
- } while((*i)->hidden());
+
+ RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*>(*i);
+
+ if (rtav && rtav->route()->record_enabled()) {
+ continue;
+ }
+
+ if (!(*i)->hidden()) {
+ break;
+ }
+
+ } while (true);
}
} else {
if (i != allviews.begin()) {
if (i == allviews.begin()) {
return true;
}
+
--i;
- } while ((*i)->hidden());
+
+ RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*>(*i);
+
+ if (rtav && rtav->route()->record_enabled()) {
+ continue;
+ }
+
+ if (!(*i)->hidden()) {
+ break;
+ }
+
+ } while (true);
}
}
-
- (*i)->name_entry.grab_focus();
- _editor.ensure_time_axis_view_is_visible (**i);
+
+ if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) {
+ (*i)->name_entry.grab_focus();
+ _editor.ensure_time_axis_view_is_visible (**i);
+ }
}
return true;
TimeAxisView::name_entry_focus_in (GdkEventFocus*)
{
name_entry.select_region (0, -1);
- name_entry.set_name ("EditorActiveTrackNameDisplay");
+ name_entry.set_state (STATE_SELECTED);
return false;
}
last_name_entry_key_press_event = 0;
name_entry_key_timeout.disconnect ();
- name_entry.set_name ("EditorTrackNameDisplay");
name_entry.select_region (0,0);
+ name_entry.set_state (STATE_NORMAL);
/* do the real stuff */
Button* buttons[5];
const int border_width = 2;
- extra_height = (2 * border_width);
+ const int separator_height = 2;
+ extra_height = (2 * border_width) + separator_height;
window.add (one_row_table);
Gtk::Requisition req(one_row_table.size_request ());
// height required to show 1 row of buttons
-
- small_height = req.height + (2 * border_width);
+ button_height = req.height;
}
void
* TimeAxisView is non-0 if this object covers y, or one of its children does.
* If the covering object is a child axis, then the child is returned.
* TimeAxisView is 0 otherwise.
- * Layer index is the layer number if the TimeAxisView is valid and is in stacked
- * region display mode, otherwise 0.
+ * Layer index is the layer number (possibly fractional) if the TimeAxisView is valid
+ * and is in stacked or expanded * region display mode, otherwise 0.
*/
-std::pair<TimeAxisView*, layer_t>
+std::pair<TimeAxisView*, double>
TimeAxisView::covers_y_position (double y)
{
if (hidden()) {
if (_y_position <= y && y < (_y_position + height)) {
/* work out the layer index if appropriate */
- layer_t l = 0;
- if (layer_display () == Stacked && view ()) {
- /* compute layer */
- l = layer_t ((_y_position + height - y) / (view()->child_height ()));
- /* clamp to max layers to be on the safe side; sometimes the above calculation
- returns a too-high value */
- if (l >= view()->layers ()) {
- l = view()->layers() - 1;
+ double l = 0;
+ switch (layer_display ()) {
+ case Overlaid:
+ break;
+ case Stacked:
+ if (view ()) {
+ /* compute layer */
+ l = layer_t ((_y_position + height - y) / (view()->child_height ()));
+ /* clamp to max layers to be on the safe side; sometimes the above calculation
+ returns a too-high value */
+ if (l >= view()->layers ()) {
+ l = view()->layers() - 1;
+ }
+ }
+ break;
+ case Expanded:
+ if (view ()) {
+ int const n = floor ((_y_position + height - y) / (view()->child_height ()));
+ l = n * 0.5 - 0.5;
+ if (l >= (view()->layers() - 0.5)) {
+ l = view()->layers() - 0.5;
+ }
}
+ break;
}
return std::make_pair (this, l);
{
switch (h) {
case HeightLargest:
- return extra_height + 48 + 250;
+ return (button_height * 2) + extra_height + 250;
case HeightLarger:
- return extra_height + 48 + 150;
+ return (button_height * 2) + extra_height + 150;
case HeightLarge:
- return extra_height + 48 + 50;
+ return (button_height * 2) + extra_height + 50;
case HeightNormal:
- return extra_height + 48;
+ return (button_height * 2) + extra_height;
case HeightSmall:
- return small_height;
+ return button_height + extra_height;
}
/* NOTREACHED */
/* this method is not required to trigger a global redraw */
string str = gui_property ("height");
-
+
if (!str.empty()) {
set_height (atoi (str));
} else {
set_height (preset_height (HeightNormal));
}
}
+
+TrackViewList
+TrackViewList::filter_to_unique_playlists ()
+{
+ std::set<boost::shared_ptr<ARDOUR::Playlist> > playlists;
+ TrackViewList ts;
+
+ for (iterator i = begin(); i != end(); ++i) {
+ RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*i);
+ if (!rtav) {
+ /* not a route: include it anyway */
+ ts.push_back (*i);
+ } else {
+ boost::shared_ptr<ARDOUR::Track> t = rtav->track();
+ if (t) {
+ if (playlists.insert (t->playlist()).second) {
+ /* playlist not seen yet */
+ ts.push_back (*i);
+ }
+ } else {
+ /* not a track: include it anyway */
+ ts.push_back (*i);
+ }
+ }
+ }
+ return ts;
+}
projects / ardour.git / blobdiff