Commit 37b7e524 authored by Claudio Valerio's avatar Claudio Valerio

Merge branch 'claudio-dev' into OEFUniboard

parents ed075924 4e958f77
......@@ -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);
......
......@@ -1522,6 +1522,8 @@ void UBBoardView::leaveEvent (QEvent * event)
if (scene ())
scene ()->leaveEvent (event);
mJustSelectedItems.clear();
QGraphicsView::leaveEvent (event);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment