fix compiler warnings.

[ardour.git] / gtk2_ardour / canvas-flag.cc

diff --git a/gtk2_ardour/canvas-flag.cc b/gtk2_ardour/canvas-flag.cc
index 55bf853b7cd3df0fd41b4fe453b19e791f7e8472..fd000f2a853faf7a588259eee373b469ce824054 100644 (file)
--- a/gtk2_ardour/canvas-flag.cc
+++ b/gtk2_ardour/canvas-flag.cc
@@ -1,15 +1,60 @@
-#include "canvas-flag.h"
+/*
+    Copyright (C) 2012 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <iostream>
+
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/rgb_macros.h"
+
 #include "ardour_ui.h"
+#include "canvas-flag.h"
+#include "canvas-noevent-pixbuf.h"
+#include "time_axis_view_item.h"
+#include "utils.h"
 
 using namespace Gnome::Canvas;
 using namespace std;
 
+CanvasFlag::CanvasFlag (MidiRegionView& region,
+                        Group&          parent,
+                        double          height,
+                        guint           outline_color_rgba,
+                        guint           fill_color_rgba,
+                        double          x,
+                        double          y)
+       : Group(parent, x, y)
+       , _name_pixbuf(0)
+       , _height(height)
+       , _outline_color_rgba(outline_color_rgba)
+       , _fill_color_rgba(fill_color_rgba)
+       , _region(region)
+       , name_pixbuf_width (0)
+       , _line(0)
+       , _rect(0)
+{
+}
+
 void
 CanvasFlag::delete_allocated_objects()
 {
-       delete _text;
-       _text = 0;
+       delete _name_pixbuf;
+       _name_pixbuf = 0;
 
        delete _line;
        _line = 0;
@@ -19,24 +64,29 @@ CanvasFlag::delete_allocated_objects()
 }
 
 void
-CanvasFlag::set_text(const string& a_text)
+CanvasFlag::set_text (const string& text)
 {
        delete_allocated_objects();
 
-       _text = new InteractiveText(*this, this, 0.0, 0.0, Glib::ustring(a_text));
-       _text->property_justification() = Gtk::JUSTIFY_CENTER;
-       _text->property_fill_color_rgba() = _outline_color_rgba;
-       double flagwidth  = _text->property_text_width()  + 10.0;
-       double flagheight = _text->property_text_height() + 3.0;
-       _text->property_x() = flagwidth / 2.0;
-       _text->property_y() = flagheight / 2.0;
-       _text->show();
+       _name_pixbuf = new ArdourCanvas::NoEventPixbuf (*this);
+       name_pixbuf_width = Gtkmm2ext::pixel_width (text, TimeAxisViewItem::NAME_FONT) + 2;
+       Gdk::Color c;
+       set_color (c, _outline_color_rgba);
+       _name_pixbuf->property_pixbuf() = Gtkmm2ext::pixbuf_from_string (text, TimeAxisViewItem::NAME_FONT, name_pixbuf_width, 
+                                                                        TimeAxisViewItem::NAME_HEIGHT, c);
+       _name_pixbuf->property_x() = 10.0;
+       _name_pixbuf->property_y() = 2.0;
+       _name_pixbuf->show();
+
+       double flagwidth  = name_pixbuf_width + 8.0;
+       double flagheight = TimeAxisViewItem::NAME_HEIGHT + 3.0;
        _line = new SimpleLine(*this, 0.0, 0.0, 0.0, _height);
        _line->property_color_rgba() = _outline_color_rgba;
-       _rect = new InteractiveRect(*this, this, 0.0, 0.0, flagwidth, flagheight);
+       _rect = new SimpleRect(*this, 0.0, 0.0, flagwidth, flagheight);
        _rect->property_outline_color_rgba() = _outline_color_rgba;
        _rect->property_fill_color_rgba() = _fill_color_rgba;
-       _text->raise_to_top();
+
+       _name_pixbuf->raise_to_top();
 }
 
 CanvasFlag::~CanvasFlag()
@@ -44,8 +94,12 @@ CanvasFlag::~CanvasFlag()
        delete_allocated_objects();
 }
 
-bool
-CanvasFlag::on_event(GdkEvent* /*ev*/)
+void
+CanvasFlag::set_height (double h)
 {
-       return false;
+       _height = h;
+
+       if (_line) {
+               _line->property_y2() = _height;
+       }
 }