From a8bd6ecc4fe4016090fad92daf6d9a572941d035 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 21 Jun 2014 11:43:42 -0400 Subject: refactor Canvas so that all Items have children; add Container abstract base class; rename Group as "Layout" and retain only drawing semantics --- libs/canvas/scroll_group.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'libs/canvas/scroll_group.cc') diff --git a/libs/canvas/scroll_group.cc b/libs/canvas/scroll_group.cc index d78caf4ed0..15b607a564 100644 --- a/libs/canvas/scroll_group.cc +++ b/libs/canvas/scroll_group.cc @@ -28,13 +28,13 @@ using namespace std; using namespace ArdourCanvas; ScrollGroup::ScrollGroup (Canvas* c, ScrollSensitivity s) - : Group (c) + : Layout (c) , _scroll_sensitivity (s) { } -ScrollGroup::ScrollGroup (Group* g, ScrollSensitivity s) - : Group (g) +ScrollGroup::ScrollGroup (Item* parent, ScrollSensitivity s) + : Layout (parent) , _scroll_sensitivity (s) { } @@ -60,12 +60,10 @@ ScrollGroup::render (Rect const & area, Cairo::RefPtr context) c context->save (); context->rectangle (self.x0, self.y0, self.width(), self.height()); context->clip (); - - Group::render (area, context); + + Layout::render (area, context); context->restore (); - - } void -- cgit v1.2.3