projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some capitalisation in the preferences dialog.
[ardour.git]
/
libs
/
canvas
/
types.cc
diff --git
a/libs/canvas/types.cc
b/libs/canvas/types.cc
index a8c690bbbe85e2a9bea8cbc7af143f82a3cb0807..4fd064d7467b1f844847207b6006e85da02ad0cd 100644
(file)
--- a/
libs/canvas/types.cc
+++ b/
libs/canvas/types.cc
@@
-121,39
+121,16
@@
Rect::fix () const
return r;
}
return r;
}
-Rect
-Rect::convert_to_device (Cairo::RefPtr<Cairo::Context> c) const
+bool
+ArdourCanvas::operator!= (Rect const& a, Rect const& b)
{
{
- Coord xa, ya, xb, yb;
-
- xa = x0;
- xb = x1;
- ya = y0;
- yb = y1;
-
- c->user_to_device (xa, ya);
- c->user_to_device (xb, yb);
-
- return Rect (xa, ya, xb, yb);
+ return a.x0 != b.x0 ||
+ a.x1 != b.x1 ||
+ a.y0 != b.y0 ||
+ a.y1 != b.y1;
}
}
-Rect
-Rect::convert_to_user (Cairo::RefPtr<Cairo::Context> c) const
-{
- Coord xa, ya, xb, yb;
-
- xa = x0;
- xb = x1;
- ya = y0;
- yb = y1;
-
- c->device_to_user (xa, ya);
- c->device_to_user (xb, yb);
-
- return Rect (xa, ya, xb, yb);
-}
-
Duple
ArdourCanvas::operator- (Duple const & o)
{
Duple
ArdourCanvas::operator- (Duple const & o)
{
@@
-172,6
+149,12
@@
ArdourCanvas::operator== (Duple const & a, Duple const & b)
return a.x == b.x && a.y == b.y;
}
return a.x == b.x && a.y == b.y;
}
+bool
+ArdourCanvas::operator!= (Duple const & a, Duple const & b)
+{
+ return a.x != b.x || a.y != b.y;
+}
+
Duple
ArdourCanvas::operator- (Duple const & a, Duple const & b)
{
Duple
ArdourCanvas::operator- (Duple const & a, Duple const & b)
{