projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unusued roll_delay member of DiskReader
[ardour.git]
/
libs
/
canvas
/
flag.cc
diff --git
a/libs/canvas/flag.cc
b/libs/canvas/flag.cc
index 9fa59dbbd5072332e2d0a4078ffd0144def451a9..25f1893366a2748a4c7f8c0de09d4448cc69d9d2 100644
(file)
--- a/
libs/canvas/flag.cc
+++ b/
libs/canvas/flag.cc
@@
-25,7
+25,7
@@
using namespace std;
using namespace ArdourCanvas;
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)
: Container (canvas)
, _outline_color (outline_color)
, _fill_color (fill_color)
@@
-34,7
+34,7
@@
Flag::Flag (Canvas* canvas, Distance height, Color outline_color, Color fill_col
setup (height, position);
}
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)
: Container (parent)
, _outline_color (outline_color)
, _fill_color (fill_color)
@@
-72,17
+72,18
@@
Flag::set_font_description (Pango::FontDescription font_description)
void
Flag::set_text (string const & text)
{
void
Flag::set_text (string const & text)
{
- if (text.empty ()) {
- _text->set (" ");
- } else if (text == _text->text()) {
+ if (text == _text->text()) {
return;
return;
+ } else if (text.empty ()) {
+ _text->set (" ");
} else {
_text->set (text);
}
} else {
_text->set (text);
}
- boost::optional<Rect> bbox = _text->bounding_box ();
+
+ Rect bbox = _text->bounding_box ();
assert (bbox);
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());
if (_invert) {
const Distance h = fabs(_line->y1() - _line->y0());
@@
-100,9
+101,9
@@
Flag::set_height (Distance h)
_line->set (Duple (0, 0), Duple (0, h));
if (_invert) {
_line->set (Duple (0, 0), Duple (0, h));
if (_invert) {
-
boost::optional<Rect>
bbox = _text->bounding_box ();
+
Rect
bbox = _text->bounding_box ();
if (bbox) {
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));
}
_rectangle->set (Rect (0, h - flag_size.y, flag_size.x, h));
_text->set_position (Duple (5, h - flag_size.y + 2));
}
@@
-118,3
+119,12
@@
Flag::covers (Duple const & point) const
return false;
}
return false;
}
+
+double
+Flag::width () const
+{
+ Rect bbox = _text->bounding_box ();
+ assert (bbox);
+
+ return bbox.width() + 10;
+}