projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Source List) RegionFactory should return an empty region here.
[ardour.git]
/
libs
/
canvas
/
fill.cc
diff --git
a/libs/canvas/fill.cc
b/libs/canvas/fill.cc
index 42fe1556846857959c05c67efcf18c006bfeb182..32af6bd74b740ac7985fc133de94e3fe17888177 100644
(file)
--- a/
libs/canvas/fill.cc
+++ b/
libs/canvas/fill.cc
@@
-19,16
+19,12
@@
#include <cairomm/cairomm.h>
#include <cairomm/cairomm.h>
-#include "ardour/utils.h"
-
#include "pbd/compose.h"
#include "pbd/convert.h"
#include "canvas/fill.h"
#include "canvas/item.h"
#include "canvas/types.h"
#include "pbd/compose.h"
#include "pbd/convert.h"
#include "canvas/fill.h"
#include "canvas/item.h"
#include "canvas/types.h"
-#include "canvas/utils.h"
-#include "canvas/colors.h"
using namespace std;
using namespace ArdourCanvas;
using namespace std;
using namespace ArdourCanvas;
@@
-42,14
+38,14
@@
Fill::Fill (Item& self)
}
void
}
void
-Fill::set_fill_color (Color color)
+Fill::set_fill_color (
Gtkmm2ext::
Color color)
{
if (_fill_color != color) {
_self.begin_visual_change ();
_fill_color = color;
double r, g, b, a;
{
if (_fill_color != color) {
_self.begin_visual_change ();
_fill_color = color;
double r, g, b, a;
- color_to_rgba (color, r, g, b, a);
+
Gtkmm2ext::
color_to_rgba (color, r, g, b, a);
if (a == 0.0) {
_transparent = true;
} else {
if (a == 0.0) {
_transparent = true;
} else {
@@
-76,7
+72,7
@@
Fill::setup_fill_context (Cairo::RefPtr<Cairo::Context> context) const
if (_pattern) {
context->set_source (_pattern);
} else {
if (_pattern) {
context->set_source (_pattern);
} else {
- set_source_rgba (context, _fill_color);
+
Gtkmm2ext::
set_source_rgba (context, _fill_color);
}
}
}
}
@@
-93,7
+89,7
@@
Fill::setup_gradient_context (Cairo::RefPtr<Cairo::Context> context, Rect const
for (StopList::const_iterator s = _stops.begin(); s != _stops.end(); ++s) {
double r, g, b, a;
for (StopList::const_iterator s = _stops.begin(); s != _stops.end(); ++s) {
double r, g, b, a;
- color_to_rgba (s->second, r, g, b, a);
+
Gtkmm2ext::
color_to_rgba (s->second, r, g, b, a);
_gradient->add_color_stop_rgba (s->first, r, g, b, a);
}
_gradient->add_color_stop_rgba (s->first, r, g, b, a);
}