projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'libs/temporal/MSVCtemporal/timecode.vcproj' to 'libs/temporal/MSVCtemporal...
[ardour.git]
/
libs
/
canvas
/
curve.cc
diff --git
a/libs/canvas/curve.cc
b/libs/canvas/curve.cc
index ba6ac68df6d651730b436f4a447ee26defe23dba..dac9983e07701de4050ced07834432c80c0ec5c7 100644
(file)
--- a/
libs/canvas/curve.cc
+++ b/
libs/canvas/curve.cc
@@
-31,7
+31,6
@@
Curve::Curve (Canvas* c)
: PolyItem (c)
, n_samples (0)
, points_per_segment (16)
: PolyItem (c)
, n_samples (0)
, points_per_segment (16)
- , curve_type (CatmullRomCentripetal)
, curve_fill (None)
{
}
, curve_fill (None)
{
}
@@
-40,7
+39,6
@@
Curve::Curve (Item* parent)
: PolyItem (parent)
, n_samples (0)
, points_per_segment (16)
: PolyItem (parent)
, n_samples (0)
, points_per_segment (16)
- , curve_type (CatmullRomCentripetal)
, curve_fill (None)
{
}
, curve_fill (None)
{
}
@@
-92,10
+90,10
@@
Curve::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
return;
}
return;
}
- Rect self = item_to_window (_bounding_box
.get()
);
-
boost::optional<Rect>
d = self.intersection (area);
+ Rect self = item_to_window (_bounding_box);
+
Rect
d = self.intersection (area);
assert (d);
assert (d);
- Rect draw = d
.get ()
;
+ Rect draw = d;
/* Our approach is to always draw n_segments across our total size.
*
/* Our approach is to always draw n_segments across our total size.
*
@@
-103,7
+101,7
@@
Curve::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
* section of the curve. For now we rely on cairo clipping to help
* with this.
*/
* section of the curve. For now we rely on cairo clipping to help
* with this.
*/
-
+
setup_outline_context (context);
setup_outline_context (context);
@@
-167,7
+165,7
@@
Curve::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
draw = draw.expand (4.0);
/* now clip it to the actual points in the curve */
draw = draw.expand (4.0);
/* now clip it to the actual points in the curve */
-
+
if (draw.x0 < w1.x) {
draw.x0 = w1.x;
}
if (draw.x0 < w1.x) {
draw.x0 = w1.x;
}