using namespace std;
using namespace ArdourCanvas;
-Flag::Flag (Canvas* canvas, Distance height, Color outline_color, Color fill_color, Duple position, bool invert)
+Flag::Flag (Canvas* canvas, Distance height, Gtkmm2ext::Color outline_color, Gtkmm2ext::Color fill_color, Duple position, bool invert)
: Container (canvas)
, _outline_color (outline_color)
, _fill_color (fill_color)
setup (height, position);
}
-Flag::Flag (Item* parent, Distance height, Color outline_color, Color fill_color, Duple position, bool invert)
+Flag::Flag (Item* parent, Distance height, Gtkmm2ext::Color outline_color, Gtkmm2ext::Color fill_color, Duple position, bool invert)
: Container (parent)
, _outline_color (outline_color)
, _fill_color (fill_color)
void
Flag::set_text (string const & text)
{
- if (text.empty ()) {
- _text->set (" ");
- } else if (text == _text->text()) {
+ if (text == _text->text()) {
return;
+ } else if (text.empty ()) {
+ _text->set (" ");
} else {
_text->set (text);
}
- boost::optional<Rect> bbox = _text->bounding_box ();
+
+ Rect bbox = _text->bounding_box ();
assert (bbox);
- Duple flag_size (bbox.get().width() + 10, bbox.get().height() + 4);
+ Duple flag_size (bbox.width() + 10, bbox.height() + 4);
if (_invert) {
const Distance h = fabs(_line->y1() - _line->y0());
_line->set (Duple (0, 0), Duple (0, h));
if (_invert) {
- boost::optional<Rect> bbox = _text->bounding_box ();
+ Rect bbox = _text->bounding_box ();
if (bbox) {
- Duple flag_size (bbox.get().width() + 10, bbox.get().height() + 4);
+ Duple flag_size (bbox.width() + 10, bbox.height() + 4);
_rectangle->set (Rect (0, h - flag_size.y, flag_size.x, h));
_text->set_position (Duple (5, h - flag_size.y + 2));
}
return false;
}
+
+double
+Flag::width () const
+{
+ Rect bbox = _text->bounding_box ();
+ assert (bbox);
+
+ return bbox.width() + 10;
+}