projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repeat INSENSITIVE colors instead of relying on inheritance
[ardour.git]
/
libs
/
canvas
/
canvas
/
arc.h
diff --git
a/libs/canvas/canvas/arc.h
b/libs/canvas/canvas/arc.h
index fc1b72163e3d9cb3445c43ea7192e780bb5c421f..76342c3985a311368546db60bf5bb4838987faba 100644
(file)
--- a/
libs/canvas/canvas/arc.h
+++ b/
libs/canvas/canvas/arc.h
@@
-19,16
+19,20
@@
#ifndef __CANVAS_ARC_H__
#define __CANVAS_ARC_H__
#ifndef __CANVAS_ARC_H__
#define __CANVAS_ARC_H__
+#include "canvas/visibility.h"
#include "canvas/item.h"
#include "canvas/outline.h"
#include "canvas/fill.h"
namespace ArdourCanvas {
#include "canvas/item.h"
#include "canvas/outline.h"
#include "canvas/fill.h"
namespace ArdourCanvas {
-class Arc : virtual public Item, public Outline, public Fill
+class Canvas;
+
+class LIBCANVAS_API Arc : public Item
{
public:
{
public:
- Arc (Group *);
+ Arc (Canvas*);
+ Arc (Item*);
void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
void compute_bounding_box () const;
void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
void compute_bounding_box () const;
@@
-38,7
+42,7
@@
public:
void set_arc (double degrees);
void set_start (double degrees);
void set_arc (double degrees);
void set_start (double degrees);
- Duple center() const {
+ Duple center() const {
return _center;
}
Coord radius () const {
return _center;
}
Coord radius () const {
@@
-51,13
+55,15
@@
public:
return _start_degrees;
}
return _start_degrees;
}
+ bool covers (Duple const &) const;
+
private:
Duple _center;
Coord _radius;
double _arc_degrees;
double _start_degrees;
};
private:
Duple _center;
Coord _radius;
double _arc_degrees;
double _start_degrees;
};
-
+
}
#endif
}
#endif