Revert the canvas widget changes, which cause performance regressions

on GTK2 on some platforms.

(bzr r15023.3.1)

1 files changed, 15 insertions, 4 deletions

diff --git a/src/desktop.cpp b/src/desktop.cpp
index d482d0d7f..331ab3351 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -111,6 +111,7 @@ SPDesktop::SPDesktop() :
     sketch( NULL ),
     controls( NULL ),
     tempgroup ( NULL ),
+    table( NULL ),
     page( NULL ),
     page_border( NULL ),
     current( NULL ),
@@ -210,7 +211,11 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid
     g_signal_connect (G_OBJECT (main), "event", G_CALLBACK (sp_desktop_root_handler), this);
 
     /* This is the background the page sits on. */
-    canvas->setBackgroundColor(0xffffff00);
+    table = sp_canvas_item_new (main, SP_TYPE_CTRLRECT, NULL);
+    SP_CTRLRECT(table)->setRectangle(Geom::Rect(Geom::Point(-80000, -80000), Geom::Point(80000, 80000)));
+    SP_CTRLRECT(table)->setColor(0x00000000, true, 0x00000000);
+    SP_CTRLRECT(table)->setCheckerboard( false );
+    sp_canvas_item_move_to_z (table, 0);
 
     page = sp_canvas_item_new (main, SP_TYPE_CTRLRECT, NULL);
     ((CtrlRect *) page)->setColor(0x00000000, FALSE, 0x00000000);
@@ -1728,11 +1733,17 @@ static void _namedview_modified (SPObject *obj, guint flags, SPDesktop *desktop)
     SPNamedView *nv=SP_NAMEDVIEW(obj);
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
+
+        /* Set page background */
+        sp_canvas_item_show (desktop->table);
         if (nv->pagecheckerboard) {
-            desktop->canvas->setBackgroundCheckerboard();
+            ((CtrlRect *) desktop->table)->setCheckerboard( true );
+            ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor ); // | 0xff);
         } else {
-            desktop->canvas->setBackgroundColor(nv->pagecolor);
+            ((CtrlRect *) desktop->table)->setCheckerboard( false );
+            ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor | 0xff);
         }
+        sp_canvas_item_move_to_z (desktop->table, 0);
 
         /* Show/hide page border */
         if (nv->showborder) {
@@ -1745,7 +1756,7 @@ static void _namedview_modified (SPObject *obj, guint flags, SPDesktop *desktop)
             }
             // place in the z-order stack
             if (nv->borderlayer == SP_BORDER_LAYER_BOTTOM) {
-                 sp_canvas_item_move_to_z (desktop->page_border, 1);
+                 sp_canvas_item_move_to_z (desktop->page_border, 2);
             } else {
                 int order = sp_canvas_item_order (desktop->page_border);
                 int morder = sp_canvas_item_order (desktop->drawing);