diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-11-11 13:36:38 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-11-11 13:36:38 +0000 |
| commit | fcfbd65268cbba8b1fd1cebc32654a43ba051d1a (patch) | |
| tree | 72518bd6571ad65d2ba5562fe2c88faf37c5bd1a /gtk2_ardour/marker.h | |
| parent | 40ca64c65959f27629c47176600582763c14f660 (diff) | |
Further fixes for #3529. Show marker lines the same colour as their marker; adjust height of lines.
git-svn-id: svn://localhost/ardour2/branches/3.0@8009 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.h')
| -rw-r--r-- | gtk2_ardour/marker.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index 623e624f9d..e5885e6611 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -54,7 +54,7 @@ class Marker : public sigc::trackable }; - Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, Type, + Marker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type, nframes_t frame = 0, bool handle_events = true); virtual ~Marker (); @@ -63,10 +63,9 @@ class Marker : public sigc::trackable ArdourCanvas::Item& the_item() const; - void add_line (ArdourCanvas::Group*, double y_origin, double initial_height); - void show_line (); - void hide_line (); - void set_line_vpos (double y_origin, double height); + void set_selected (bool); + void set_show_line (bool); + void canvas_height_set (double); void set_position (framepos_t); void set_name (const std::string&); @@ -87,27 +86,33 @@ class Marker : public sigc::trackable Pango::FontDescription* name_font; - ArdourCanvas::Group * _parent; + ArdourCanvas::Group* _parent; + ArdourCanvas::Group* _line_parent; ArdourCanvas::Group *group; ArdourCanvas::Polygon *mark; ArdourCanvas::Pixbuf *name_pixbuf; ArdourCanvas::Points *points; - ArdourCanvas::SimpleLine *line; + ArdourCanvas::SimpleLine* _line; ArdourCanvas::Points *line_points; double unit_position; - framepos_t frame_position; + framepos_t frame_position; unsigned char shift; /* should be double, but its always small and integral */ - Type _type; + Type _type; int name_height; + bool _selected; + bool _shown; + double _canvas_height; + uint32_t _color; void reposition (); + void setup_line (); }; class TempoMarker : public Marker { public: - TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::TempoSection&); + TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&); ~TempoMarker (); ARDOUR::TempoSection& tempo() const { return _tempo; } @@ -119,7 +124,7 @@ class TempoMarker : public Marker class MeterMarker : public Marker { public: - MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::MeterSection&); + MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&); ~MeterMarker (); ARDOUR::MeterSection& meter() const { return _meter; } |