summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-06-24 23:03:11 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-06-24 23:03:11 -0400
commit2108525187a420c0090b5834c82c473a072436a9 (patch)
tree9fa11d8c506a2823bbdc574df112012a6aaa487e
parenta1f858d3b207739e0719c1fc28003f1d9dd3965d (diff)
fix up size and drawing of measure lines, even when vertically scrolled
-rw-r--r--gtk2_ardour/editor_tempodisplay.cc2
-rw-r--r--gtk2_ardour/tempo_lines.cc4
-rw-r--r--libs/canvas/canvas/types.h1
3 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 5e1c72af97..b997d3bb5d 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -176,7 +176,7 @@ Editor::draw_measures (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
}
if (tempo_lines == 0) {
- tempo_lines = new TempoLines (*_track_canvas, time_line_group, physical_screen_height(get_window()));
+ tempo_lines = new TempoLines (*_track_canvas, time_line_group, ArdourCanvas::COORD_MAX);
}
tempo_lines->draw (begin, end, samples_per_pixel);
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 6bf7dfbde9..083b7a5cca 100644
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -25,10 +25,10 @@
using namespace std;
-TempoLines::TempoLines (ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height)
+TempoLines::TempoLines (ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double h)
: _canvas (canvas)
, _group (group)
- , _height (screen_height)
+ , _height (h)
{
}
diff --git a/libs/canvas/canvas/types.h b/libs/canvas/canvas/types.h
index de98ddb18f..33bb92ca58 100644
--- a/libs/canvas/canvas/types.h
+++ b/libs/canvas/canvas/types.h
@@ -39,7 +39,6 @@ typedef double Distance;
typedef uint32_t Color;
extern Coord const COORD_MAX;
-extern Coord const CAIRO_MAX;
struct Duple
{