hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Improve rendering of bar model editor

Browse Source 
Increase the margin from 2 to 3 so that we have a more prominent border
around the filled area.

Fix a problem in the rendering code which led to situations where the
bar was drawn to the left of the start position for small values.

Return a more exact minimum size hint.
This commit is contained in:
Michael Gregorius
2023-07-09 16:56:42 +02:00
parent 77c881f23b
commit db3df4a8f5
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/widgets/BarModelEditor.cpp
View File

@@ -21,7 +21,7 @@ QSizePolicy BarModelEditor::sizePolicy() const
QSize BarModelEditor::minimumSizeHint() const
{
auto const fm = fontMetrics();
return QSize(200, fm.height() * 1.3);
return QSize(200, fm.height() + 6);
}
QSize BarModelEditor::sizeHint() const
@@ -53,16 +53,20 @@ void BarModelEditor::paintEvent(QPaintEvent *event)
// min + x * (max - min) = v <=> x = (v - min) / (max - min)
auto const percentage = range == 0 ? 1. : (mod->value() - minValue) / range;
int const margin = 2;
int const margin = 3;
QMargins const margins(margin, margin, margin, margin);
QRect const valueRect = r.marginsRemoved(margins);
painter.setPen(foreground);
painter.setBrush(foreground);
painter.drawRect(QRect(valueRect.topLeft(), QPoint(valueRect.width() * percentage, valueRect.height())));
QPoint const startPoint = valueRect.topLeft();
QPoint endPoint = valueRect.bottomRight();
endPoint.setX(startPoint.x() + percentage * (endPoint.x() - startPoint.x()));
// Draw text
QRect const textRect = valueRect.marginsRemoved(margins);
painter.drawRect(QRect(startPoint, endPoint));
// Draw the text into the value rectangle but move it slightly to the right
QRect const textRect = valueRect.marginsRemoved(QMargins(3, 0, 0, 0));
painter.setPen(textColor);
painter.drawText(textRect, m_text);
}