smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-07 14:15:46 +01:00
Code Issues Projects Releases Wiki Activity

further pixel-by-pixel tweaks to deal with the fact that the skip bar is 1 pixel shorter than the marker bar

Browse source
This commit is contained in:
Paul Davis 2014-09-24 12:38:29 -04:00
parent 01fa5ba3a2
commit cffd50766a
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/editor.cc
View file

@ -247,9 +247,10 @@ Editor::Editor ()
: PublicEditor ("editor_window.xml")
, _join_object_range_state (JOIN_OBJECT_RANGE_NONE)
, timebar_height (xml_property (*xml_tree ()->root (), "timebar_height", 17.0))
, ruler_height (xml_property (*xml_tree ()->root (), "ruler_height", 27.0))
, ruler_height (xml_property (*xml_tree ()->root (), "ruler_height", 26.0))
, loopbar_height (xml_property (*xml_tree ()->root (), "loopbar_height", 26.0))
, marker_height (xml_property (*xml_tree ()->root (), "marker_height", 17.0))
, marker_height (xml_property (*xml_tree ()->root (), "marker_height", 18))
, skipbar_height (xml_property (*xml_tree ()->root (), "skipbar_height", 17))
/* time display buttons */
, minsec_label (_("Mins:Secs"))
, bbt_label (_("Bars:Beats"))

1
gtk2_ardour/editor.h
View file

@ -877,6 +877,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
const double ruler_height;
const double loopbar_height;
const double marker_height;
const double skipbar_height;
Gtk::Menu *editor_ruler_menu;

4
gtk2_ardour/editor_canvas.cc
View file

@ -183,7 +183,7 @@ Editor::initialize_canvas ()
/* not outlined, so that there is no gap between it and the ruler in the same group */
punch_loop_bar->set_outline (false);
skip_bar = new ArdourCanvas::Rectangle (skip_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, marker_height));
skip_bar = new ArdourCanvas::Rectangle (skip_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, skipbar_height));
CANVAS_DEBUG_NAME (skip_bar, "skip Bar");
skip_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM);
@ -193,7 +193,7 @@ Editor::initialize_canvas ()
/* Rectangles displayed on the bars during drag operations */
skip_drag_rect = new ArdourCanvas::Rectangle (skip_group, ArdourCanvas::Rect (0.0, 0.0, 100, marker_height));
skip_drag_rect = new ArdourCanvas::Rectangle (skip_group, ArdourCanvas::Rect (0.0, 0.0, 100, skipbar_height));
CANVAS_DEBUG_NAME (skip_drag_rect, "skip drag");
skip_drag_rect->set_outline (false);
skip_drag_rect->hide ();

2
gtk2_ardour/editor_markers.cc
View file

@ -127,7 +127,7 @@ Editor::add_new_location_internal (Location* location)
} else if (location->is_skip ()) {
/* skip: single marker that spans entire skip area */
lam->start = new RangeMarker (location, *this, *skip_group, marker_height, 0, location->name(), location->start(), location->end());
lam->start = new RangeMarker (location, *this, *skip_group, skipbar_height, 0, location->name(), location->start(), location->end());
lam->end = 0;
group = skip_group;

3
gtk2_ardour/editor_rulers.cc
View file

@ -140,6 +140,7 @@ Editor::initialize_rulers ()
clock_ruler = new ArdourCanvas::Ruler (ruler_group, *_minsec_metric, ArdourCanvas::Rect (0, loopbar_height, ArdourCanvas::COORD_MAX, loopbar_height + ruler_height));
clock_ruler->set_font_description (font);
CANVAS_DEBUG_NAME (clock_ruler, "clock ruler");
clock_ruler->set_outline (false);
clock_ruler->raise_to_top ();
ARDOUR_UI::instance()->primary_clock->mode_changed.connect (sigc::mem_fun (*this, &Editor::update_ruler_visibility));
@ -408,7 +409,7 @@ Editor::update_ruler_visibility ()
}
skip_playback_lane.show ();
skip_group->show();
pos += marker_height; // skip_bar->y1() - skip_bar->y0();
pos += skipbar_height; // skip_bar->y1() - skip_bar->y0();
} else {
skip_playback_lane.hide ();
skip_group->hide();

5
gtk2_ardour/ui/editor_window.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Window timebar_height="17"
ruler_height="27"
ruler_height="26"
loopbar_height="26"
marker_height="17" >
skipbar_height="17"
marker_height="18" >
<style name="topbar_dropdown"
bgnormal="#43919A"
fgnormal="#ffffff"