smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

libcanvas: reapply LineSet::add_line -> add_coord change after rebase conflicts with master

Browse source
This commit is contained in:
Paul Davis 2021-05-10 15:12:38 -06:00
parent 19768953bf
commit 82bad0725a
5 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/grid_lines.cc
View file

@ -66,11 +66,11 @@ GridLines::draw (std::vector<Ruler::Mark> marks)
samplepos_t s = m->position; samplepos_t s = m->position;
if ((*m).style == ArdourCanvas::Ruler::Mark::Major) { if ((*m).style == ArdourCanvas::Ruler::Mark::Major) {
lines.add_line (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, major_color); lines.add_coord (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, major_color);
} else if ((*m).style == ArdourCanvas::Ruler::Mark::Minor) { } else if ((*m).style == ArdourCanvas::Ruler::Mark::Minor) {
lines.add_line (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, minor_color); lines.add_coord (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, minor_color);
} else { } else {
lines.add_line (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, micro_color); lines.add_coord (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, micro_color);
} }
} }
} }

4
gtk2_ardour/midi_streamview.cc
View file

@ -342,7 +342,7 @@ MidiStreamView::draw_note_lines()
*/ */
if (i <= highest_note()) { if (i <= highest_note()) {
_note_lines->add_line (y, 1.0, UIConfiguration::instance().color ("piano roll black outline")); _note_lines->add_coord (y, 1.0, UIConfiguration::instance().color ("piano roll black outline"));
} }
/* now add a thicker line/bar which covers the entire vertical /* now add a thicker line/bar which covers the entire vertical
@ -366,7 +366,7 @@ MidiStreamView::draw_note_lines()
double mid = y + (h/2.0); double mid = y + (h/2.0);
if (mid >= 0 && h > 1.0) { if (mid >= 0 && h > 1.0) {
_note_lines->add_line (mid, h, color); _note_lines->add_coord (mid, h, color);
} }
prev_y = y; prev_y = y;

7
libs/canvas/canvas/box.h
View file

@ -21,7 +21,7 @@
#ifndef __CANVAS_BOX_H__ #ifndef __CANVAS_BOX_H__
#define __CANVAS_BOX_H__ #define __CANVAS_BOX_H__
#include "canvas/item.h" #include "canvas/rectangle.h"
namespace ArdourCanvas namespace ArdourCanvas
{ {
@ -39,7 +39,7 @@ class Rectangle;
* *
* Other? * Other?
*/ */
class LIBCANVAS_API Box : public Item class LIBCANVAS_API Box : public Rectangle
{ {
public: public:
enum Orientation { enum Orientation {
@ -77,11 +77,10 @@ public:
void child_changed (bool bbox_changed); void child_changed (bool bbox_changed);
private: private:
Rectangle *self;
bool collapse_on_hide; bool collapse_on_hide;
bool homogenous; bool homogenous;
bool ignore_child_changes;
void reset_self ();
void reposition_children (); void reposition_children ();
}; };

2
libs/canvas/canvas/line_set.h
View file

@ -47,7 +47,7 @@ public:
void set_extent (Distance); void set_extent (Distance);
Distance extent() const { return _extent; } Distance extent() const { return _extent; }
void add_line (Coord, Distance, Gtkmm2ext::Color); void add_coord (Coord, Distance, Gtkmm2ext::Color);
void clear (); void clear ();
struct Line { struct Line {

2
libs/canvas/line_set.cc
View file

@ -131,7 +131,7 @@ LineSet::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
} }
void void
LineSet::add_line (Coord y, Distance width, Gtkmm2ext::Color color) LineSet::add_coord (Coord y, Distance width, Gtkmm2ext::Color color)
{ {
begin_change (); begin_change ();