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

Sketcher: fix cropping of some icons on hidpi screens

Browse Source
This commit is contained in:
captain0xff
2025-08-16 00:40:41 +05:30
committed by Kacper Donat
parent 51f4ad7432
commit ed770bf849
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Gui/ToolHandler.cpp
View File

@@ -197,17 +197,14 @@ void ToolHandler::addCursorTail(std::vector<QPixmap>& pixmaps)
int newIconWidth = baseCursorWidth + tailWidth;
int newIconHeight = baseCursorHeight;
QPixmap newIcon(newIconWidth, newIconHeight);
QPixmap newIcon(newIconWidth * pixelRatio, newIconHeight * pixelRatio);
newIcon.setDevicePixelRatio(pixelRatio);
newIcon.fill(Qt::transparent);
QPainter qp;
qp.begin(&newIcon);
qp.drawPixmap(QPointF(0, 0),
baseIcon.scaled(baseCursorWidth * pixelRatio,
baseCursorHeight * pixelRatio,
Qt::KeepAspectRatio,
Qt::SmoothTransformation));
qp.drawPixmap(QPointF(0, 0), baseIcon);
// Iterate through pixmaps and them to the cursor pixmap
qreal currentIconX = baseCursorWidth;
@@ -215,7 +212,7 @@ void ToolHandler::addCursorTail(std::vector<QPixmap>& pixmaps)
for (auto& icon : pixmaps) {
currentIconY = baseCursorHeight - icon.height();
qp.drawPixmap(QPointF(currentIconX, currentIconY), icon);
qp.drawPixmap(QPointF(currentIconX, currentIconY) / pixelRatio, icon);
currentIconX += icon.width();
}

4
src/Mod/Sketcher/Gui/CommandConstraints.cpp
View File

@@ -1338,7 +1338,7 @@ private:
QSizeF(iconWidth, iconWidth));
QPainter cursorPainter;
cursorPainter.begin(&cursorPixmap);
cursorPainter.drawPixmap(16 * pixelRatio, 16 * pixelRatio, icon);
cursorPainter.drawPixmap(16, 16, icon);
cursorPainter.end();
int hotX = 8;
int hotY = 8;
@@ -1626,7 +1626,7 @@ public:
QPixmap icon = Gui::BitmapFactory().pixmapFromSvg("Constraint_Dimension", QSizeF(iconWidth, iconWidth));
QPainter cursorPainter;
cursorPainter.begin(&cursorPixmap);
cursorPainter.drawPixmap(16 * pixelRatio, 16 * pixelRatio, icon);
cursorPainter.drawPixmap(16, 16, icon);
cursorPainter.end();
int hotX = 8;
int hotY = 8;

2
src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp
View File

@@ -2756,6 +2756,8 @@ QImage EditModeConstraintCoinManager::renderConstrIcon(const QString& type,
pxMap); // Cache for speed, avoiding pixmapFromSvg
}
QImage icon = pxMap.toImage();
// The pixmap was already scaled so we don't need to scale the image
icon.setDevicePixelRatio(1.0f);
QFont font = ViewProviderSketchCoinAttorney::getApplicationFont(viewProvider);
font.setPixelSize(static_cast<int>(1.0 * drawingParameters.constraintIconSize));