LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix drawing ActionIcons in MasterPalette

Browse source
This commit is contained in:
Casper Jeukendrup 2022-03-31 21:55:29 +02:00
parent 013888e617
commit 6ded38f5d8
No known key found for this signature in database
GPG key ID: 6C571BEF59E722DD
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/palette/view/widgets/palettewidget.cpp
View file

@ -583,6 +583,12 @@ QPixmap PaletteWidget::pixmapForCellAt(int paletteIdx) const
qreal cellMag = cell->mag * mag;
ElementPtr element = cell->element;
if (element->isActionIcon()) {
toActionIcon(element.get())->setFontSize(ActionIcon::DEFAULT_FONT_SIZE * cell->mag);
cellMag = 1.0;
}
element->layout();
RectF r = element->bbox();
@ -600,9 +606,6 @@ QPixmap PaletteWidget::pixmapForCellAt(int paletteIdx) const
mu::draw::Painter painter(&pm, "palette");
painter.setAntialiasing(true);
if (element->isActionIcon()) {
toActionIcon(element.get())->setExtent(w < h ? w : h);
}
painter.scale(cellMag, cellMag);
painter.translate(-r.topLeft());
@ -1043,7 +1046,7 @@ void PaletteWidget::paintEvent(QPaintEvent* /*event*/)
qreal cellMag = currentCell->mag * mag;
if (el->isActionIcon()) {
toActionIcon(el.get())->setExtent((hhgrid < vgridM ? hhgrid : vgridM) - 4);
toActionIcon(el.get())->setFontSize(ActionIcon::DEFAULT_FONT_SIZE * currentCell->mag);
cellMag = 1.0;
}
el->layout();