# HG changeset patch # User Dmitriy Morozov <dmitriy@mrzv.org> # Date 1454353906 28800 # Node ID c62a23291b604849ff2f80d5cdd12552e355eb05 # Parent b714decd7d5b7a3f7d254f09642f515edc70bc3f Lukas Barth's patch for Ipe 7.2.2 diff -r b714decd7d5b -r c62a23291b60 canvasview.cpp --- a/canvasview.cpp Mon Jan 04 22:35:58 2016 -0800 +++ b/canvasview.cpp Mon Feb 01 11:11:46 2016 -0800 @@ -100,8 +100,7 @@ { iDoc = doc; - // iDoc->page(iPageNo)->setSelect(0, EPrimarySelected); - //iCanvas->setFontPool(iDoc->fontPool()); + iCanvas->setResources(iDoc->resources()); iCanvas->setPage(iDoc->page(iPageNo), iPageNo, iViewNo, iDoc->cascade()); iCanvas->setPan(Vector(300, 400)); static_cast<CanvasBase*>(iCanvas)->update(); diff -r b714decd7d5b -r c62a23291b60 mainwindow.cpp --- a/mainwindow.cpp Mon Jan 04 22:35:58 2016 -0800 +++ b/mainwindow.cpp Mon Feb 01 11:11:46 2016 -0800 @@ -197,9 +197,8 @@ iPageNo = 0; iViewNo = 0; - // iDoc->page(iPageNo)->setSelect(0, EPrimarySelected); - //currentViewCanvas->setFontPool(iDoc->fontPool()); - //nextViewCanvas->setFontPool(iDoc->fontPool()); + currentViewCanvas->setResources(iDoc->resources()); + nextViewCanvas->setResources(iDoc->resources()); currentViewCanvas->setPage(iDoc->page(iPageNo), iPageNo, iViewNo, iDoc->cascade()); currentViewCanvas->setPan(Vector(300, 400));