Merge branch 'claudio-dev' into OEFUniboard

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -407,6 +407,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
 
                 if (!pageDpi.isNull())
                     UBSettings::settings()->pageDpi->set(pageDpi.toString());
+                else
+                    UBSettings::settings()->pageDpi->set(UBApplication::desktop()->physicalDpiX());
 
                 bool darkBackground = false;
                 bool crossedBackground = false;
@@ -719,7 +721,9 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                     {
                         QDesktopWidget* desktop = UBApplication::desktop();
                         qreal currentDpi = (desktop->physicalDpiX() + desktop->physicalDpiY()) / 2;
+                        qDebug() << "currentDpi " << currentDpi;
                         qreal pdfScale = UBSettings::settings()->pageDpi->get().toReal()/currentDpi;
+                        qDebug() << "pdfScale " << pdfScale;
                         pdfItem->setScale(pdfScale);
                         pdfItem->setFlag(QGraphicsItem::ItemIsMovable, true);
                         pdfItem->setFlag(QGraphicsItem::ItemIsSelectable, true);

src/board/UBBoardView.cpp

@@ -1522,6 +1522,8 @@ void UBBoardView::leaveEvent (QEvent * event)
     if (scene ())
         scene ()->leaveEvent (event);
 
+    mJustSelectedItems.clear();
+
     QGraphicsView::leaveEvent (event);
 }