projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
probe buffersize if jackd is already running.
[ardour.git]
/
libs
/
canvas
/
fill.cc
diff --git
a/libs/canvas/fill.cc
b/libs/canvas/fill.cc
index 8a16f4f794099d6250f054ced93b98928efee98d..bf72c678aabad34dad5ad232d1af642dc1103eac 100644
(file)
--- a/
libs/canvas/fill.cc
+++ b/
libs/canvas/fill.cc
@@
-17,32
+17,46
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <cairomm/cairomm.h>
+
#include "ardour/utils.h"
#include "pbd/compose.h"
#include "pbd/convert.h"
#include "canvas/fill.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 "canvas/utils.h"
#include "canvas/utils.h"
+#include "canvas/colors.h"
using namespace std;
using namespace ArdourCanvas;
using namespace std;
using namespace ArdourCanvas;
-Fill::Fill (
Group* parent
)
- :
Item (parent
)
+Fill::Fill (
Item& self
)
+ :
_self (self
)
, _fill_color (0x000000ff)
, _fill (true)
, _fill_color (0x000000ff)
, _fill (true)
+ , _transparent (false)
{
{
-
}
void
Fill::set_fill_color (Color color)
{
if (_fill_color != color) {
}
void
Fill::set_fill_color (Color color)
{
if (_fill_color != color) {
- begin_visual_change ();
+
_self.
begin_visual_change ();
_fill_color = color;
_fill_color = color;
- end_visual_change ();
+
+ double r, g, b, a;
+ color_to_rgba (color, r, g, b, a);
+ if (a == 0.0) {
+ _transparent = true;
+ } else {
+ _transparent = false;
+ }
+
+ _self.end_visual_change ();
}
}
}
}
@@
-50,16
+64,20
@@
void
Fill::set_fill (bool fill)
{
if (_fill != fill) {
Fill::set_fill (bool fill)
{
if (_fill != fill) {
- begin_visual_change ();
+
_self.
begin_visual_change ();
_fill = fill;
_fill = fill;
- end_visual_change ();
+
_self.
end_visual_change ();
}
}
void
Fill::setup_fill_context (Cairo::RefPtr<Cairo::Context> context) const
{
}
}
void
Fill::setup_fill_context (Cairo::RefPtr<Cairo::Context> context) const
{
- set_source_rgba (context, _fill_color);
+ if (_pattern) {
+ context->set_source (_pattern);
+ } else {
+ set_source_rgba (context, _fill_color);
+ }
}
void
}
void
@@
-82,10
+100,16
@@
Fill::setup_gradient_context (Cairo::RefPtr<Cairo::Context> context, Rect const
context->set_source (_gradient);
}
context->set_source (_gradient);
}
+void
+Fill::set_pattern (Cairo::RefPtr<Cairo::Pattern> p)
+{
+ _pattern = p;
+}
+
void
Fill::set_gradient (StopList const & stops, bool vertical)
{
void
Fill::set_gradient (StopList const & stops, bool vertical)
{
- begin_visual_change ();
+
_self.
begin_visual_change ();
if (stops.empty()) {
_stops.clear ();
if (stops.empty()) {
_stops.clear ();
@@
-94,5
+118,5
@@
Fill::set_gradient (StopList const & stops, bool vertical)
_vertical_gradient = vertical;
}
_vertical_gradient = vertical;
}
- end_visual_change ();
+
_self.
end_visual_change ();
}
}