Optimize automation-event process splitting

[ardour.git] / gtk2_ardour / canvas_test.cc

diff --git a/gtk2_ardour/canvas_test.cc b/gtk2_ardour/canvas_test.cc
index ddead312b6bfdc309d13dcebd612d55e6eeb6099..9dc16ba7d4d0485d0575aad143ce5e3a1a93ed90 100644 (file)
--- a/gtk2_ardour/canvas_test.cc
+++ b/gtk2_ardour/canvas_test.cc
@@ -22,7 +22,7 @@
 #include "canvas/types.h"
 #include "canvas/canvas.h"
 #include "canvas/container.h"
-#include "canvas/colors.h"
+#include "gtkmm2ext/colors.h"
 #include "canvas/debug.h"
 #include "canvas/grid.h"
 #include "canvas/scroll_group.h"
@@ -181,7 +181,7 @@ CANVAS_UI::initialize_canvas (ArdourCanvas::Canvas& canvas)
        grid->set_outline (false);
        grid->set_row_spacing (60.0);
        grid->set_col_spacing (3.0);
-       grid->set_homogenous (true);
+       grid->set_homogenous (false);
 
        ArdourCanvas::Text* text1 = new ArdourCanvas::Text (&canvas);
        text1->set ("hello, world");
@@ -199,10 +199,10 @@ CANVAS_UI::initialize_canvas (ArdourCanvas::Canvas& canvas)
        text4->set ("I am fourth");
        text4->set_color (Color (0xffff00ff));
 
-       grid->place (text1, 0, 0);
-       grid->place (text2, 1, 0);
-       grid->place (text3, 0, 1);
-       grid->place (text4, 1, 1);
+       grid->place (text1, 0, 0, 2, 1);
+       grid->place (text2, 2, 0);
+       grid->place (text3, 0, 2, 1, 2);
+       grid->place (text4, 1, 3);
 
        ArdourButton* button1 = new ArdourButton ("auto-return");
        ArdourButton* button2 = new ArdourButton ("auto-play");
@@ -211,10 +211,10 @@ CANVAS_UI::initialize_canvas (ArdourCanvas::Canvas& canvas)
 
        ArdourCanvas::Widget* w1 = new ArdourCanvas::Widget (&canvas, *button1);
        CANVAS_DEBUG_NAME (w1, "w1");
-       grid->place (w1, 3, 0);
+       grid->place (w1, 3, 0, 2, 0);
        ArdourCanvas::Widget* w2 = new ArdourCanvas::Widget (&canvas, *button2);
        CANVAS_DEBUG_NAME (w2, "w2");
-       grid->place (w2, 4, 0);
+       grid->place (w2, 5, 0, 2, 0);
        ArdourCanvas::Widget* w3 = new ArdourCanvas::Widget (&canvas, *button3);
        CANVAS_DEBUG_NAME (w3, "w3");
        grid->place (w3, 3, 1);