kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: [skip ci] fix computing of hotspot of sketcher icons on Wayland

Browse Source 
Restrict the hotspot multiplication on unix platforms to X11 (xcb platform)
This commit is contained in:
Greg V
2021-02-04 00:08:10 +03:00
committed by wwmayer
parent 28c66fc501
commit ce7b57a08f
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
View File

@@ -29,6 +29,7 @@
# include <Inventor/nodes/SoText2.h>
# include <Inventor/nodes/SoFont.h>
# include <QPainter>
# include <QGuiApplication>
# include <cmath>
#endif // #ifndef _PreComp_
@@ -113,12 +114,13 @@ void DrawSketchHandler::setSvgCursor(const QString & cursorName, int x, int y, c
qreal pRatio = devicePixelRatio();
bool isRatioOne = (pRatio == 1.0);
qreal defaultCursorSize = isRatioOne ? 64 : 32;
#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
qreal hotX = x;
qreal hotY = y;
#else
qreal hotX = x * pRatio;
qreal hotY = y * pRatio;
#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC)
if (qGuiApp->platformName() == QLatin1String("xcb")) {
hotX *= pRatio;
hotY *= pRatio;
}
#endif
qreal cursorSize = defaultCursorSize * pRatio;
@@ -155,12 +157,13 @@ void DrawSketchHandler::setCursor(const QPixmap &p,int x,int y, bool autoScale)
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
p1.setDevicePixelRatio(pRatio);
#endif
#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
qreal hotX = x;
qreal hotY = y;
#else
qreal hotX = x * pRatio;
qreal hotY = y * pRatio;
#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC)
if (qGuiApp->platformName() == QLatin1String("xcb")) {
hotX *= pRatio;
hotY *= pRatio;
}
#endif
cursor = QCursor(p1, hotX, hotY);
} else {

1
src/Mod/Sketcher/Gui/PreCompiled.h
View File

@@ -95,6 +95,7 @@
# include <Gui/Qt4All.h>
#endif
# include <QGuiApplication>
# include <QMessageBox>
#include <qdebug.h>
#include <QString>