smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused vestigial frame member of TimeAxisViewItem

Browse source
This commit is contained in:
Tim Mayberry 2015-09-30 20:18:10 +10:00
parent c292cd95ac
commit d6943a3406
3 changed files with 0 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/dark.colors
View file

@ -472,7 +472,6 @@
<ColorAlias name="trim knob: arc end" alias="color 81"/> <ColorAlias name="trim knob: arc end" alias="color 81"/>
<ColorAlias name="trim knob: arc start" alias="color 82"/> <ColorAlias name="trim knob: arc start" alias="color 82"/>
<ColorAlias name="verbose canvas cursor" alias="color 32"/> <ColorAlias name="verbose canvas cursor" alias="color 32"/>
<ColorAlias name="vestigial frame" alias="color 4"/>
<ColorAlias name="video timeline bar" alias="color 46"/> <ColorAlias name="video timeline bar" alias="color 46"/>
<ColorAlias name="waveform fill" alias="color 13"/> <ColorAlias name="waveform fill" alias="color 13"/>
<ColorAlias name="waveform outline" alias="color 4"/> <ColorAlias name="waveform outline" alias="color 4"/>

24
gtk2_ardour/time_axis_view_item.cc
View file

@ -171,14 +171,12 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
position_locked = false; position_locked = false;
max_item_duration = ARDOUR::max_framepos; max_item_duration = ARDOUR::max_framepos;
min_item_duration = 0; min_item_duration = 0;
show_vestigial = false;
visibility = vis; visibility = vis;
_sensitive = true; _sensitive = true;
name_text_width = 0; name_text_width = 0;
last_item_width = 0; last_item_width = 0;
wide_enough_for_name = wide; wide_enough_for_name = wide;
high_enough_for_name = high; high_enough_for_name = high;
vestigial_frame = 0;
if (duration == 0) { if (duration == 0) {
warning << "Time Axis Item Duration == 0" << endl; warning << "Time Axis Item Duration == 0" << endl;
@ -572,11 +570,6 @@ TimeAxisViewItem::set_height (double height)
} }
} }
if (vestigial_frame) {
vestigial_frame->set_y0 (0.0);
vestigial_frame->set_y1 (height);
}
set_colors (); set_colors ();
} }
@ -824,19 +817,6 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
if (pixel_width < 2.0) { if (pixel_width < 2.0) {
if (show_vestigial) {
if (!vestigial_frame) {
vestigial_frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height()));
CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
vestigial_frame->set_outline_color (UIConfiguration::instance().color ("vestigial frame"));
vestigial_frame->set_fill_color (UIConfiguration::instance().color ("vestigial frame"));
vestigial_frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
}
vestigial_frame->show();
}
if (frame) { if (frame) {
frame->set_outline (false); frame->set_outline (false);
frame->set_x1 (std::max(1.0, pixel_width)); frame->set_x1 (std::max(1.0, pixel_width));
@ -848,10 +828,6 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
} }
} else { } else {
if (vestigial_frame) {
vestigial_frame->hide();
}
if (frame) { if (frame) {
frame->set_outline (true); frame->set_outline (true);
/* Note: x0 is always zero - the position is defined by /* Note: x0 is always zero - the position is defined by

4
gtk2_ardour/time_axis_view_item.h
View file

@ -210,9 +210,6 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
/** true if the name should respond to events */ /** true if the name should respond to events */
bool name_connected; bool name_connected;
/** true if a small vestigial rect should be shown when the item gets very narrow */
bool show_vestigial;
uint32_t fill_color; uint32_t fill_color;
uint32_t last_item_width; uint32_t last_item_width;
@ -221,7 +218,6 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
bool high_enough_for_name; bool high_enough_for_name;
ArdourCanvas::Container* group; ArdourCanvas::Container* group;
ArdourCanvas::Rectangle* vestigial_frame;
ArdourCanvas::Rectangle* frame; ArdourCanvas::Rectangle* frame;
ArdourCanvas::Rectangle* selection_frame; ArdourCanvas::Rectangle* selection_frame;
ArdourCanvas::Text* name_text; ArdourCanvas::Text* name_text;