From 2c9b0796a3e1797bde5dea2151b757f13ca2a8ac Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 30 Jan 2017 18:41:11 +0100 Subject: [PATCH] change Grid API to avoid unnecessary Duple and open door for row/col span --- libs/canvas/canvas/grid.h | 2 +- libs/canvas/grid.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/canvas/canvas/grid.h b/libs/canvas/canvas/grid.h index cfed3f1643..c0afa4bdfa 100644 --- a/libs/canvas/canvas/grid.h +++ b/libs/canvas/canvas/grid.h @@ -47,7 +47,7 @@ public: void set_border_width (double w) { set_outline_width (w); } void set_border_color (Color c) { set_outline_color (c); } - void place (Item*, Duple coord); + void place (Item*, double x, double y, double col_span = 1, double row_span = 1); void set_collapse_on_hide (bool); void set_homogenous (bool); diff --git a/libs/canvas/grid.cc b/libs/canvas/grid.cc index 7ceb1585ed..f8fd0bcce4 100644 --- a/libs/canvas/grid.cc +++ b/libs/canvas/grid.cc @@ -313,10 +313,10 @@ Grid::reposition_children () } void -Grid::place (Item* i, Duple at) +Grid::place (Item* i, double x, double y, double col_span, double row_span) { add (i); - coords_by_item.insert (std::make_pair (i, at)); + coords_by_item.insert (std::make_pair (i, Duple (x, y))); reposition_children (); } -- 2.30.2