smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +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

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

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

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

@ -47,7 +47,7 @@ public:
void set_extent (Distance);
Distance extent() const { return _extent; }
void add_line (Coord, Distance, Gtkmm2ext::Color);
void add_coord (Coord, Distance, Gtkmm2ext::Color);
void clear ();
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
LineSet::add_line (Coord y, Distance width, Gtkmm2ext::Color color)
LineSet::add_coord (Coord y, Distance width, Gtkmm2ext::Color color)
{
begin_change ();