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 3e922c2344b4a25b2826b9e5552ba473b1ed0a10..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"
@@ -172,11 +172,16 @@ CANVAS_UI::initialize_canvas (ArdourCanvas::Canvas& canvas)
                        ScrollGroup::ScrollSensitivity (ScrollGroup::ScrollsVertically|ScrollGroup::ScrollsHorizontally));
 
        grid = new ArdourCanvas::Grid (scroll_group);
-       grid->set_padding (10.0);
-       grid->set_margin (20.0);
+
+       grid->set_padding (40.0);
+       grid->set_margin (0.0);
+
        grid->set_outline_width (3.0);
        grid->set_outline_color (Color (0x3daec1ff));
-       grid->set_outline (true);
+       grid->set_outline (false);
+       grid->set_row_spacing (60.0);
+       grid->set_col_spacing (3.0);
+       grid->set_homogenous (false);
 
        ArdourCanvas::Text* text1 = new ArdourCanvas::Text (&canvas);
        text1->set ("hello, world");
@@ -194,12 +199,11 @@ CANVAS_UI::initialize_canvas (ArdourCanvas::Canvas& canvas)
        text4->set ("I am fourth");
        text4->set_color (Color (0xffff00ff));
 
-#if 0
-       grid->place (text1, ArdourCanvas::Duple (0, 0));
-       grid->place (text2, ArdourCanvas::Duple (1, 0));
-       grid->place (text3, ArdourCanvas::Duple (0, 1));
-       grid->place (text4, ArdourCanvas::Duple (1, 1));
-#endif
+       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");
        ArdourButton* button3 = new ArdourButton ("follow range");
@@ -207,16 +211,16 @@ CANVAS_UI::initialize_canvas (ArdourCanvas::Canvas& canvas)
 
        ArdourCanvas::Widget* w1 = new ArdourCanvas::Widget (&canvas, *button1);
        CANVAS_DEBUG_NAME (w1, "w1");
-       grid->place (w1, ArdourCanvas::Duple (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, ArdourCanvas::Duple (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, ArdourCanvas::Duple (3, 1));
+       grid->place (w3, 3, 1);
        ArdourCanvas::Widget* w4 = new ArdourCanvas::Widget (&canvas, *button4);
        CANVAS_DEBUG_NAME (w4, "w4");
-       grid->place (w4, ArdourCanvas::Duple (4, 1));
+       grid->place (w4, 4, 1);
 
        //ArdourCanvas::Widget* w = new ArdourCanvas::Widget (scroll_group, test_button);
        //CANVAS_DEBUG_NAME (w, "TheW");