/*
- Copyright (C) 2000 Paul Davis
+ Copyright (C) 2000 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <libgnomecanvasmm/item.h>
#include "pbd/error.h"
+#include "pbd/convert.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
#include "ardour/session.h"
#include "ardour/utils.h"
#include "ardour/location.h"
#include "ardour_ui.h"
+#include "global_signals.h"
+#include "gui_thread.h"
#include "public_editor.h"
#include "time_axis_view.h"
#include "region_view.h"
#include "rgb_macros.h"
#include "utils.h"
#include "streamview.h"
+#include "editor_drag.h"
#include "i18n.h"
using namespace std;
using namespace Gtk;
using namespace Gdk;
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;
using namespace ArdourCanvas;
+using Gtkmm2ext::Keyboard;
const double trim_handle_size = 6.0; /* pixels */
-
-uint32_t TimeAxisView::hLargest = 0;
-uint32_t TimeAxisView::hLarge = 0;
-uint32_t TimeAxisView::hLarger = 0;
-uint32_t TimeAxisView::hNormal = 0;
-uint32_t TimeAxisView::hSmaller = 0;
-uint32_t TimeAxisView::hSmall = 0;
-bool TimeAxisView::need_size_info = true;
+uint32_t TimeAxisView::extra_height;
+uint32_t TimeAxisView::smaller_height;
int const TimeAxisView::_max_order = 512;
+PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
-TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisViewPtr rent, Canvas& canvas)
- : AxisView (sess),
+TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
+ : AxisView (sess),
controls_table (2, 8),
_y_position (0),
_editor (ed),
_order (0)
{
- if (need_size_info) {
- compute_controls_size_info ();
- need_size_info = false;
+ if (extra_height == 0) {
+ compute_heights ();
}
+
_canvas_background = new Group (*ed.get_background_group (), 0.0, 0.0);
_canvas_display = new Group (*ed.get_trackview_group (), 0.0, 0.0);
+ _canvas_display->hide(); // reveal as needed
selection_group = new Group (*_canvas_display);
+ selection_group->set_data (X_("timeselection"), (void *) 1);
selection_group->hide();
_ghost_group = new Group (*_canvas_display);
control_parent = 0;
display_menu = 0;
- size_menu = 0;
_hidden = false;
in_destructor = false;
height = 0;
*/
name_entry.set_name ("EditorTrackNameDisplay");
- name_entry.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::name_entry_button_release));
- name_entry.signal_button_press_event().connect (mem_fun (*this, &TimeAxisView::name_entry_button_press));
- name_entry.signal_key_release_event().connect (mem_fun (*this, &TimeAxisView::name_entry_key_release));
- name_entry.signal_activate().connect (mem_fun(*this, &TimeAxisView::name_entry_activated));
- name_entry.signal_focus_in_event().connect (mem_fun (*this, &TimeAxisView::name_entry_focus_in));
- name_entry.signal_focus_out_event().connect (mem_fun (*this, &TimeAxisView::name_entry_focus_out));
+ name_entry.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_button_release));
+ name_entry.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_button_press));
+ name_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_release));
+ name_entry.signal_activate().connect (sigc::mem_fun(*this, &TimeAxisView::name_entry_activated));
+ name_entry.signal_focus_in_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_in));
+ name_entry.signal_focus_out_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_out));
Gtkmm2ext::set_size_request_to_display_given_text (name_entry, N_("gTortnam"), 10, 10); // just represents a short name
name_label.set_name ("TrackLabel");
name_hbox.show ();
+ controls_table.set_size_request (200);
controls_table.set_border_width (2);
controls_table.set_row_spacings (0);
controls_table.set_col_spacings (0);
controls_table.show_all ();
controls_table.set_no_show_all ();
- resizer.set_size_request (10, 10);
+ resizer.set_size_request (10, 6);
resizer.set_name ("ResizeHandle");
- resizer.signal_expose_event().connect (mem_fun (*this, &TimeAxisView::resizer_expose));
- resizer.signal_button_press_event().connect (mem_fun (*this, &TimeAxisView::resizer_button_press));
- resizer.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::resizer_button_release));
- resizer.signal_motion_notify_event().connect (mem_fun (*this, &TimeAxisView::resizer_motion));
+ resizer.signal_expose_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_expose));
+ resizer.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_button_press));
+ resizer.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_button_release));
+ resizer.signal_motion_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_motion));
+
resizer.set_events (Gdk::BUTTON_PRESS_MASK|
Gdk::BUTTON_RELEASE_MASK|
Gdk::POINTER_MOTION_MASK|
HSeparator* separator = manage (new HSeparator());
controls_vbox.pack_start (controls_table, false, false);
- controls_vbox.pack_end (*separator, false, false);
- controls_vbox.pack_end (resizer_box, false, true);
+ controls_vbox.pack_end (resizer_box, false, false);
controls_vbox.show ();
//controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
controls_ebox.add_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|SCROLL_MASK);
controls_ebox.set_flags (CAN_FOCUS);
- controls_ebox.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
- controls_ebox.signal_scroll_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
+ controls_ebox.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
+ controls_ebox.signal_scroll_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
- controls_hbox.pack_start (controls_ebox,true,true);
+ controls_hbox.pack_start (controls_ebox, false, false);
controls_hbox.show ();
- ColorsChanged.connect (mem_fun (*this, &TimeAxisView::color_handler));
+ time_axis_vbox.pack_start (controls_hbox, true, true);
+ time_axis_vbox.pack_end (*separator, false, false);
+ time_axis_vbox.show();
+
+ ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler));
+
+ GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&TimeAxisView::erase_ghost, this, _1), gui_context());
}
TimeAxisView::~TimeAxisView()
delete (*i)->end_trim;
}
- for (list<SimpleLine*>::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
- delete (*i);
- }
-
delete selection_group;
selection_group = 0;
TimeAxisView::show_at (double y, int& nth, VBox *parent)
{
if (control_parent) {
- control_parent->reorder_child (controls_hbox, nth);
+ control_parent->reorder_child (time_axis_vbox, nth);
} else {
control_parent = parent;
- parent->pack_start (controls_hbox, false, false);
- parent->reorder_child (controls_hbox, nth);
+ parent->pack_start (time_axis_vbox, false, false);
+ parent->reorder_child (time_axis_vbox, nth);
}
_order = nth;
_canvas_display->raise_to_top ();
if (_marked_for_display) {
- controls_hbox.show ();
+ time_axis_vbox.show ();
controls_ebox.show ();
_canvas_background->show ();
}
if (canvas_item_visible ((*i)->_canvas_display)) {
++nth;
_effective_height += (*i)->show_at (y + _effective_height, nth, parent);
- }
+ }
}
return _effective_height;
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)) {
void
TimeAxisView::selection_click (GdkEventButton* ev)
{
- Selection::Operation op = Keyboard::selection_type (ev->state);
- _editor.set_selected_track (shared_from_this (), op, false);
+ Selection::Operation op = ArdourKeyboard::selection_type (ev->state);
+ _editor.set_selected_track (*this, op, false);
}
void
_canvas_background->hide ();
if (control_parent) {
- control_parent->remove (controls_hbox);
+ control_parent->remove (time_axis_vbox);
control_parent = 0;
}
/* if its hidden, it cannot be selected */
- _editor.get_selection().remove (shared_from_this ());
+ _editor.get_selection().remove (this);
Hiding ();
}
void
TimeAxisView::step_height (bool bigger)
{
- static const uint32_t step = 20;
+ static const uint32_t step = 25;
if (bigger) {
- set_height (height + step);
+ if (height == preset_height(HeightSmall)) {
+ set_height (preset_height(HeightSmaller));
+ }
+ else if (height == preset_height(HeightSmaller)) {
+ set_height (preset_height(HeightNormal));
+ }
+ else {
+ set_height (height + step);
+ }
+
} else {
- if (height > step) {
- set_height (std::max (height - step, hSmall));
- } else if (height != hSmall) {
- set_height (hSmall);
+ if ( height == preset_height(HeightSmall)){
+ return;
+ }
+
+ if (height <= preset_height (HeightSmaller) && height > preset_height (HeightSmall)) {
+ set_height (preset_height(HeightSmall));
}
+ else if ( height <= preset_height (HeightNormal) && height > preset_height (HeightSmaller)){
+ set_height (preset_height(HeightSmaller));
+ }
+ else {
+ set_height (height - step);
+ }
}
}
}
void
-TimeAxisView::set_height(uint32_t h)
+TimeAxisView::set_height (Height h)
{
- controls_ebox.property_height_request () = h;
+ set_height (preset_height (h));
+}
+
+void
+TimeAxisView::set_height (uint32_t h)
+{
+ if (h < preset_height (HeightSmall)) {
+ h = preset_height (HeightSmall);
+ }
+
+ time_axis_vbox.property_height_request () = h;
height = h;
for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
/* resize the selection rect */
show_selection (_editor.get_selection().time);
}
-
- reshow_feature_lines ();
}
bool
TimeAxisView::name_entry_key_release (GdkEventKey* ev)
{
- PublicEditor::TrackViewList *allviews = 0;
- PublicEditor::TrackViewList::iterator i;
+ TrackViewList::iterator i;
switch (ev->keyval) {
case GDK_Escape:
return true;
/* Shift+Tab Keys Pressed. Note that for Shift+Tab, GDK actually
- * generates a different ev->keyval, rather than setting
+ * generates a different ev->keyval, rather than setting
* ev->state.
*/
case GDK_ISO_Left_Tab:
case GDK_Tab:
+ {
name_entry_changed ();
- allviews = _editor.get_valid_views (TimeAxisViewPtr ());
- if (allviews != 0) {
- i = find (allviews->begin(), allviews->end(), shared_from_this ());
- if (ev->keyval == GDK_Tab) {
- if (i != allviews->end()) {
- do {
- if (++i == allviews->end()) { return true; }
- } while((*i)->hidden());
- }
- } else {
- if (i != allviews->begin()) {
- do {
- if (--i == allviews->begin()) { return true; }
- } while ((*i)->hidden());
- }
+ 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());
}
-
-
- /* resize to show editable name display */
-
- if ((*i)->current_height() >= hSmall && (*i)->current_height() < hNormal) {
- (*i)->set_height (hSmaller);
+ } else {
+ if (i != allviews.begin()) {
+ do {
+ if (i == allviews.begin()) {
+ return true;
+ }
+ --i;
+ } while ((*i)->hidden());
}
-
- (*i)->name_entry.grab_focus();
}
- return true;
-
+
+
+ /* resize to show editable name display */
+
+ if ((*i)->current_height() <= preset_height (HeightSmaller)) {
+ (*i)->set_height (HeightSmaller);
+ }
+
+ (*i)->name_entry.grab_focus();
+ }
+ return true;
+
case GDK_Up:
case GDK_Down:
name_entry_changed ();
break;
}
-#ifdef TIMEOUT_NAME_EDIT
+#ifdef TIMEOUT_NAME_EDIT
/* adapt the timeout to reflect the user's typing speed */
guint32 name_entry_timeout;
/* wait 1 seconds and if no more keys are pressed, act as if they pressed enter */
name_entry_key_timeout.disconnect();
- name_entry_key_timeout = Glib::signal_timeout().connect (mem_fun (*this, &TimeAxisView::name_entry_key_timed_out), name_entry_timeout);
+ name_entry_key_timeout = Glib::signal_timeout().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_timed_out), name_entry_timeout);
#endif
return false;
}
bool
-TimeAxisView::name_entry_focus_in (GdkEventFocus* ev)
+TimeAxisView::name_entry_focus_in (GdkEventFocus*)
{
name_entry.select_region (0, -1);
name_entry.set_name ("EditorActiveTrackNameDisplay");
}
bool
-TimeAxisView::name_entry_focus_out (GdkEventFocus* ev)
+TimeAxisView::name_entry_focus_out (GdkEventFocus*)
{
/* clean up */
{
Selection& s (_editor.get_selection ());
- if (!s.selected (shared_from_this ())) {
- _editor.set_selected_track (shared_from_this (), Selection::Set);
+ if (!s.selected (this)) {
+ _editor.set_selected_track (*this, Selection::Set);
}
}
}
conditionally_add_to_selection ();
- display_menu->popup (1, when);
-}
-
-gint
-TimeAxisView::size_click (GdkEventButton *ev)
-{
- conditionally_add_to_selection ();
- popup_size_menu (ev->time);
- return TRUE;
-}
-
-void
-TimeAxisView::popup_size_menu (guint32 when)
-{
- if (size_menu == 0) {
- build_size_menu ();
- }
- size_menu->popup (1, when);
+ display_menu->popup (1, when);
}
void
if (_selected) {
controls_ebox.set_name (controls_base_selected_name);
- controls_hbox.set_name (controls_base_selected_name);
+ time_axis_vbox.set_name (controls_base_selected_name);
controls_vbox.set_name (controls_base_selected_name);
- /* propagate any existing selection, if the mode is right */
-
- if (_editor.current_mouse_mode() == Editing::MouseRange && !_editor.get_selection().time.empty()) {
- show_selection (_editor.get_selection().time);
- }
-
} else {
controls_ebox.set_name (controls_base_unselected_name);
- controls_hbox.set_name (controls_base_unselected_name);
+ time_axis_vbox.set_name (controls_base_unselected_name);
controls_vbox.set_name (controls_base_unselected_name);
hide_selection ();
resizer.queue_draw ();
}
-void
-TimeAxisView::build_size_menu ()
-{
- using namespace Menu_Helpers;
-
- size_menu = new Menu;
- size_menu->set_name ("ArdourContextMenu");
- MenuList& items = size_menu->items();
-
- items.push_back (MenuElem (_("Largest"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLargest)));
- items.push_back (MenuElem (_("Large"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLarge)));
- items.push_back (MenuElem (_("Larger"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLarger)));
- items.push_back (MenuElem (_("Normal"), bind (mem_fun (*this, &TimeAxisView::set_heights), hNormal)));
- items.push_back (MenuElem (_("Smaller"), bind (mem_fun (*this, &TimeAxisView::set_heights),hSmaller)));
- items.push_back (MenuElem (_("Small"), bind (mem_fun (*this, &TimeAxisView::set_heights), hSmall)));
-}
-
void
TimeAxisView::build_display_menu ()
{
using namespace Menu_Helpers;
+ delete display_menu;
+
display_menu = new Menu;
display_menu->set_name ("ArdourContextMenu");
AnalysisFeatureList::const_iterator i;
list<ArdourCanvas::SimpleLine*>::iterator l;
-
- for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
- (*l)->property_x1() = _editor.frame_to_pixel (*i);
- (*l)->property_x2() = _editor.frame_to_pixel (*i);
- }
}
void
-TimeAxisView::show_timestretch (nframes_t start, nframes_t end)
+TimeAxisView::show_timestretch (framepos_t start, framepos_t end)
{
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
(*i)->show_timestretch (start, end);
selection_group->raise_to_top();
for (list<AudioRange>::iterator i = ts.begin(); i != ts.end(); ++i) {
- nframes_t start, end, cnt;
+ framepos_t start, end;
+ framecnt_t cnt;
start = (*i).start;
end = (*i).end;
rect->start_trim->property_x1() = x1;
rect->start_trim->property_y1() = 1.0;
rect->start_trim->property_x2() = x1 + trim_handle_size;
- rect->start_trim->property_y2() = 1.0 + trim_handle_size;
+ rect->start_trim->property_y2() = y2;
rect->end_trim->property_x1() = x2 - trim_handle_size;
rect->end_trim->property_y1() = 1.0;
rect->end_trim->property_x2() = x2;
- rect->end_trim->property_y2() = 1.0 + trim_handle_size;
+ rect->end_trim->property_y2() = y2;
rect->start_trim->show();
rect->end_trim->show();
rect = new SelectionRect;
rect->rect = new SimpleRect (*selection_group);
+ rect->rect->property_outline_what() = 0x0;
rect->rect->property_x1() = 0.0;
rect->rect->property_y1() = 0.0;
rect->rect->property_x2() = 0.0;
rect->rect->property_y2() = 0.0;
rect->rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectionRect.get();
- rect->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
rect->start_trim = new SimpleRect (*selection_group);
+ rect->start_trim->property_outline_what() = 0x0;
rect->start_trim->property_x1() = 0.0;
rect->start_trim->property_x2() = 0.0;
- rect->start_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
- rect->start_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
-
+
rect->end_trim = new SimpleRect (*selection_group);
+ rect->end_trim->property_outline_what() = 0x0;
rect->end_trim->property_x1() = 0.0;
rect->end_trim->property_x2() = 0.0;
- rect->end_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
- rect->end_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
free_selection_rects.push_front (rect);
- rect->rect->signal_event().connect (bind (mem_fun (_editor, &PublicEditor::canvas_selection_rect_event), rect->rect, rect));
- rect->start_trim->signal_event().connect (bind (mem_fun (_editor, &PublicEditor::canvas_selection_start_trim_event), rect->rect, rect));
- rect->end_trim->signal_event().connect (bind (mem_fun (_editor, &PublicEditor::canvas_selection_end_trim_event), rect->rect, rect));
- }
+ rect->rect->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_rect_event), rect->rect, rect));
+ rect->start_trim->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_start_trim_event), rect->rect, rect));
+ rect->end_trim->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_end_trim_event), rect->rect, rect));
+ }
rect = free_selection_rects.front();
rect->id = id;
return rect;
}
+struct null_deleter { void operator()(void const *) const {} };
+
bool
-TimeAxisView::is_child (TimeAxisViewPtr tav)
+TimeAxisView::is_child (TimeAxisView* tav)
{
- return find (children.begin(), children.end(), tav) != children.end();
+ return find (children.begin(), children.end(), boost::shared_ptr<TimeAxisView>(tav, null_deleter())) != children.end();
}
void
}
}
+/** Get selectable things within a given range.
+ * @param start Start time in session frames.
+ * @param end End time in session frames.
+ * @param top Top y range, in trackview coordinates (ie 0 is the top of the track view)
+ * @param bot Bottom y range, in trackview coordinates (ie 0 is the top of the track view)
+ * @param result Filled in with selectable things.
+ */
void
-TimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& result)
+TimeAxisView::get_selectables (framepos_t /*start*/, framepos_t /*end*/, double /*top*/, double /*bot*/, list<Selectable*>& /*result*/)
{
return;
}
void
-TimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& result)
+TimeAxisView::get_inverted_selectables (Selection& /*sel*/, list<Selectable*>& /*result*/)
{
return;
}
void
TimeAxisView::add_ghost (RegionView* rv)
{
- GhostRegion* gr = rv->add_ghost (shared_from_this ());
+ GhostRegion* gr = rv->add_ghost (*this);
if(gr) {
ghosts.push_back(gr);
- gr->GoingAway.connect (mem_fun(*this, &TimeAxisView::erase_ghost));
}
}
void
-TimeAxisView::remove_ghost (RegionView* rv)
+TimeAxisView::remove_ghost (RegionView* rv)
{
- rv->remove_ghost_in (shared_from_this ());
+ rv->remove_ghost_in (*this);
}
void
-TimeAxisView::erase_ghost (GhostRegion* gr) {
- if(in_destructor) {
+TimeAxisView::erase_ghost (GhostRegion* gr)
+{
+ if (in_destructor) {
return;
}
-
- list<GhostRegion*>::iterator i;
-
- for (i = ghosts.begin(); i != ghosts.end(); ++i) {
+
+ for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
if ((*i) == gr) {
ghosts.erase (i);
break;
*/
double mybot = _y_position + current_height();
-
- return ((_y_position <= bot && _y_position >= top) ||
- ((mybot <= bot) && (top < mybot)) ||
+
+ return ((_y_position <= bot && _y_position >= top) ||
+ ((mybot <= bot) && (top < mybot)) ||
(mybot >= bot && _y_position < top));
-}
+}
void
-TimeAxisView::set_parent (TimeAxisViewPtr p)
+TimeAxisView::set_parent (TimeAxisView& p)
{
- parent = p;
+ parent = &p;
}
bool
return _has_state;
}
-TimeAxisViewPtr
+TimeAxisView*
TimeAxisView::get_parent_with_state ()
{
- if (parent == 0 || parent->has_state()) {
+ if (parent == 0) {
+ return 0;
+ }
+
+ if (parent->has_state()) {
return parent;
}
XMLNode&
TimeAxisView::get_state ()
{
+ /* XXX: is this method used? */
+
XMLNode* node = new XMLNode ("TAV-" + name());
char buf[32];
}
int
-TimeAxisView::set_state (const XMLNode& node)
+TimeAxisView::set_state (const XMLNode& node, int /*version*/)
{
const XMLProperty *prop;
+ /* XXX: I think this might be vestigial */
if ((prop = node.property ("marked-for-display")) != 0) {
_marked_for_display = (prop->value() == "1");
}
+ if ((prop = node.property ("shown-editor")) != 0) {
+ _marked_for_display = string_is_affirmative (prop->value ());
+ }
+
if ((prop = node.property ("track-height")) != 0) {
if (prop->value() == "largest") {
- set_height (hLargest);
+ set_height (HeightLargest);
} else if (prop->value() == "large") {
- set_height (hLarge);
+ set_height (HeightLarge);
} else if (prop->value() == "larger") {
- set_height (hLarger);
+ set_height (HeightLarger);
} else if (prop->value() == "normal") {
- set_height (hNormal);
+ set_height (HeightNormal);
} else if (prop->value() == "smaller") {
- set_height (hSmaller);
+ set_height (HeightSmaller);
} else if (prop->value() == "small") {
- set_height (hSmall);
+ set_height (HeightSmall);
} else {
error << string_compose(_("unknown track height name \"%1\" in XML GUI information"), prop->value()) << endmsg;
- set_height (Normal);
+ set_height (HeightNormal);
}
} else if ((prop = node.property ("height")) != 0) {
set_height (atoi (prop->value()));
-
+
} else {
- set_height (hNormal);
+ set_height (HeightNormal);
}
return 0;
(*i)->set_height ((*i)->height);
}
}
-
+
void
-TimeAxisView::compute_controls_size_info ()
+TimeAxisView::compute_heights ()
{
Gtk::Window window (Gtk::WINDOW_TOPLEVEL);
Gtk::Table two_row_table (2, 8);
Gtk::Table one_row_table (1, 8);
Button* buttons[5];
const int border_width = 2;
- const int extra_height = (2 * border_width)
+ extra_height = (2 * border_width)
//+ 2 // 2 pixels for the hseparator between TimeAxisView control areas
- + 10; // resizer button (3 x 2 pixel elements + 2 x 2 pixel gaps)
+ + 6; // resizer button (3 x 2 pixel elements + 2 x 2 pixel gaps)
window.add (one_row_table);
}
one_row_table.attach (*buttons[0], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-
+
one_row_table.show_all ();
Gtk::Requisition req(one_row_table.size_request ());
-
// height required to show 1 row of buttons
- hSmaller = req.height + extra_height;
-
- window.remove ();
- window.add (two_row_table);
-
- two_row_table.attach (*buttons[1], 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
- two_row_table.attach (*buttons[2], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
- two_row_table.attach (*buttons[3], 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
- two_row_table.attach (*buttons[4], 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-
- two_row_table.show_all ();
- req = two_row_table.size_request ();
-
- // height required to show all normal buttons
-
- hNormal = /*req.height*/ 48 + extra_height;
-
- // these heights are all just larger than normal. no more
- // elements are visible (yet).
-
- hLarger = hNormal + 50;
- hLarge = hNormal + 150;
- hLargest = hNormal + 250;
-
- // height required to show track name
-
- hSmall = 27;
+ smaller_height = req.height + extra_height;
}
void
* Layer index is the layer number if the TimeAxisView is valid and is in stacked
* region display mode, otherwise 0.
*/
-std::pair<TimeAxisViewPtr, layer_t>
+std::pair<TimeAxisView*, layer_t>
TimeAxisView::covers_y_position (double y)
{
if (hidden()) {
- return std::make_pair (TimeAxisViewPtr (), 0);
+ return std::make_pair ( (TimeAxisView *) 0, 0);
}
if (_y_position <= y && y < (_y_position + height)) {
l = view()->layers() - 1;
}
}
-
+
return std::make_pair (this, l);
}
for (Children::const_iterator i = children.begin(); i != children.end(); ++i) {
- std::pair<TimeAxisViewPtr, int> const r = (*i)->covers_y_position (y);
+ std::pair<TimeAxisView*, int> const r = (*i)->covers_y_position (y);
if (r.first) {
return r;
}
}
- return std::make_pair (TimeAxisViewPtr (), 0);
-}
-
-void
-TimeAxisView::show_feature_lines (const AnalysisFeatureList& pos)
-{
- analysis_features = pos;
- reshow_feature_lines ();
-}
-
-
-void
-TimeAxisView::hide_feature_lines ()
-{
- list<ArdourCanvas::SimpleLine*>::iterator l;
-
- for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
- (*l)->hide();
- }
-}
-
-void
-TimeAxisView::reshow_feature_lines ()
-{
- while (feature_lines.size()< analysis_features.size()) {
- ArdourCanvas::SimpleLine* l = new ArdourCanvas::SimpleLine (*_canvas_display);
- l->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();
- feature_lines.push_back (l);
- }
-
- while (feature_lines.size() > analysis_features.size()) {
- ArdourCanvas::SimpleLine *line = feature_lines.back();
- feature_lines.pop_back ();
- delete line;
- }
-
- AnalysisFeatureList::const_iterator i;
- list<ArdourCanvas::SimpleLine*>::iterator l;
-
- for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
- (*l)->property_x1() = _editor.frame_to_pixel (*i);
- (*l)->property_x2() = _editor.frame_to_pixel (*i);
- (*l)->property_y1() = 0;
- (*l)->property_y2() = current_height();
- (*l)->show ();
- }
+ return std::make_pair ( (TimeAxisView *) 0, 0);
}
bool
}
bool
-TimeAxisView::resizer_button_release (GdkEventButton* ev)
+TimeAxisView::resizer_button_release (GdkEventButton*)
{
+ _editor.stop_canvas_autoscroll ();
_resize_drag_start = -1;
return true;
}
bool
TimeAxisView::resizer_motion (GdkEventMotion* ev)
{
- if (_resize_drag_start < 0) {
- return true;
- }
-
- int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start);
- _editor.add_to_idle_resize (shared_from_this (), delta);
- _resize_drag_start = ev->y_root;
+ if (_resize_drag_start >= 0) {
+ /* (ab)use the DragManager to do autoscrolling; adjust the event coordinates
+ into the world coordinate space that DragManager::motion_handler is expecting,
+ and then fake a DragManager motion event so that when maybe_autoscroll
+ asks DragManager for the current pointer position it will get the correct
+ answers.
+ */
+ int tx, ty;
+ resizer.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);
+
+ /* now do the actual TAV resize */
+ int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start);
+ _editor.add_to_idle_resize (this, delta);
+ _resize_drag_start = ev->y_root;
+ }
return true;
}
win->get_geometry (x, y, w, h, d);
/* handle/line #1 */
-
+
win->draw_line (dark, 0, 0, w - 2, 0);
win->draw_point (dark, 0, 1);
win->draw_line (light, 1, 1, w - 1, 1);
win->draw_line (light, 1, 5, w - 1, 5);
win->draw_point (light, w - 1, 4);
- /* handle/line #3 */
-
- win->draw_line (dark, 0, 8, w - 2, 8);
- win->draw_point (dark, 0, 9);
- win->draw_line (light, 1, 9, w - 1, 9);
- win->draw_point (light, w - 1, 8);
+ /* use vertical resize mouse cursor */
+ win->set_cursor(Gdk::Cursor(Gdk::SB_V_DOUBLE_ARROW));
return true;
}
-TimeAxisViewPtr
-TimeAxisView::find_time_axis (TimeAxisView* v)
+bool
+TimeAxisView::set_visibility (bool yn)
{
- Children::iterator i = children.begin ();
- while (i != children.end() && i->get() != v) {
- ++i;
+ if (yn != marked_for_display()) {
+ if (yn) {
+ set_marked_for_display (true);
+ canvas_display()->show();
+ } else {
+ set_marked_for_display (false);
+ hide ();
+ }
+ return true; // things changed
}
+
+ return false;
+}
- if (i == children.end()) {
- return TimeAxisViewPtr ();
+uint32_t
+TimeAxisView::preset_height (Height h)
+{
+ switch (h) {
+ case HeightLargest:
+ return extra_height + 48 + 250;
+ case HeightLarger:
+ return extra_height + 48 + 150;
+ case HeightLarge:
+ return extra_height + 48 + 50;
+ case HeightNormal:
+ return extra_height + 48;
+ case HeightSmall:
+ return 27;
+ case HeightSmaller:
+ return smaller_height;
}
- return *i;
+ /* NOTREACHED */
+ return 0;
+}
+
+/** @return Child time axis views that are not hidden */
+TimeAxisView::Children
+TimeAxisView::get_child_list ()
+{
+ Children c;
+
+ for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+ if (!(*i)->hidden()) {
+ c.push_back(*i);
+ }
+ }
+
+ return c;
}
+
+
projects / ardour.git / blobdiff