git.iko.soy/unity8
on xenial help sign in
Fix crash in "make xvfbtestDragHandle"
75d2e73Daniel d'Andrada
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+8−2
compare with xenial
unifiedsplit
@@ -715,8 +715,14 @@ void DirectionalDragArea::itemChange(ItemChange change, const ItemChangeData &va
715 value.window->installEventFilter(TouchRegistry::instance());
715 value.window->installEventFilter(TouchRegistry::instance());
716
716
717 // TODO: Handle window->screen() changes (ie window changing screens)
717 // TODO: Handle window->screen() changes (ie window changing screens)
718+
718− qreal pixelsPerMm = value.window->screen()->physicalDotsPerInch() / 25.4;
719+ qreal pixelsPerInch = value.window->screen()->physicalDotsPerInch();
719− d->setPixelsPerMm(pixelsPerMm);
720+ if (pixelsPerInch < 0) {
721+ // It can return garbage when run in a XVFB server (Virtual Framebuffer 'fake' X server)
722+ pixelsPerInch = 72;
723+ }
724+
725+ d->setPixelsPerMm(pixelsPerInch / 25.4);
720 }
726 }
721 }
727 }
722}
728}