projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reimplementation of large parts of the WaveView class
[ardour.git]
/
libs
/
canvas
/
pixbuf.cc
diff --git
a/libs/canvas/pixbuf.cc
b/libs/canvas/pixbuf.cc
index 62d9357c61ddde4f93a67459beed0da8b516872d..8583ec22a18a809aa2d8199003a7550761abeccf 100644
(file)
--- a/
libs/canvas/pixbuf.cc
+++ b/
libs/canvas/pixbuf.cc
@@
-25,10
+25,14
@@
using namespace std;
using namespace ArdourCanvas;
using namespace std;
using namespace ArdourCanvas;
-Pixbuf::Pixbuf (Group* g)
- : Item (g)
+Pixbuf::Pixbuf (Canvas* c)
+ : Item (c)
+{
+}
+
+Pixbuf::Pixbuf (Item* parent)
+ : Item (parent)
{
{
-
}
void
}
void
@@
-37,14
+41,14
@@
Pixbuf::render (Rect const & /*area*/, Cairo::RefPtr<Cairo::Context> context) co
Gdk::Cairo::set_source_pixbuf (context, _pixbuf, 0, 0);
context->paint ();
}
Gdk::Cairo::set_source_pixbuf (context, _pixbuf, 0, 0);
context->paint ();
}
-
+
void
Pixbuf::compute_bounding_box () const
{
if (_pixbuf) {
void
Pixbuf::compute_bounding_box () const
{
if (_pixbuf) {
- _bounding_box =
boost::optional<Rect>
(Rect (0, 0, _pixbuf->get_width(), _pixbuf->get_height()));
+ _bounding_box =
Rect
(Rect (0, 0, _pixbuf->get_width(), _pixbuf->get_height()));
} else {
} else {
- _bounding_box =
boost::optional<Rect>
();
+ _bounding_box =
Rect
();
}
_bounding_box_dirty = false;
}
_bounding_box_dirty = false;
@@
-54,7
+58,7
@@
void
Pixbuf::set (Glib::RefPtr<Gdk::Pixbuf> pixbuf)
{
begin_change ();
Pixbuf::set (Glib::RefPtr<Gdk::Pixbuf> pixbuf)
{
begin_change ();
-
+
_pixbuf = pixbuf;
_bounding_box_dirty = true;
_pixbuf = pixbuf;
_bounding_box_dirty = true;