From 172a4a853d0de2437bc9e54a1d24be215c1fe5ff Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 14 Feb 2014 12:06:44 -0500 Subject: [PATCH] fix up problems with patch change flgs not changing height correctly --- libs/canvas/canvas/flag.h | 1 - libs/canvas/flag.cc | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/canvas/canvas/flag.h b/libs/canvas/canvas/flag.h index 0975d9373e..2a15f83921 100644 --- a/libs/canvas/canvas/flag.h +++ b/libs/canvas/canvas/flag.h @@ -38,7 +38,6 @@ public: bool covers (Duple const &) const; private: - Distance _height; Color _outline_color; Color _fill_color; Text* _text; diff --git a/libs/canvas/flag.cc b/libs/canvas/flag.cc index 495df34353..e72aece1f5 100644 --- a/libs/canvas/flag.cc +++ b/libs/canvas/flag.cc @@ -27,7 +27,6 @@ using namespace ArdourCanvas; Flag::Flag (Group* parent, Distance height, Color outline_color, Color fill_color, Duple position) : Group (parent) - , _height (height) , _outline_color (outline_color) , _fill_color (fill_color) { @@ -37,7 +36,7 @@ Flag::Flag (Group* parent, Distance height, Color outline_color, Color fill_colo _line = new Line (this); _line->set_outline_color (_outline_color); - set_height (_height); + set_height (height); _rectangle = new Rectangle (this); _rectangle->set_outline_color (_outline_color); @@ -62,9 +61,9 @@ Flag::set_text (string const & text) } void -Flag::set_height (Distance) +Flag::set_height (Distance h) { - _line->set (Duple (0, 0), Duple (0, _height)); + _line->set (Duple (0, 0), Duple (0, h)); } bool -- 2.30.2