Improved: Updated to Visual Studio 2019 and Qt 5.15.2. Running Equalizer APO requires Universal CRT now, which means that Windows versions before 10 may need additional Windows updates or the Visual C++ Redistributable for Visual Studio 2015 - 2019 needs to be installed (installer provides assistance).
This commit is contained in:
1 parent
3d51af7364
commit
c692f0639b
94 files changed
+362
-184
No files matched your search
@@ -35,7 +35,7 @@ QRectF ChannelGraphItem::boundingRect() const
|
||||
if (cachedRect.isNull())
|
||||
{
|
||||
QFontMetrics metrics(scene()->font());
|
||||
int width = metrics.width(name);
|
||||
int width = metrics.size(0, name).width();
|
||||
// we only use upper case characters and digits, so everything is above the baseline
|
||||
int height = metrics.ascent();
|
||||
// make it at least quadratic
|
||||
|
||||
@@ -63,7 +63,7 @@ void FrequencyPlotHRuler::paintEvent(QPaintEvent*)
|
||||
text = QString("%0").arg(hz);
|
||||
else
|
||||
text = QString("%0k").arg(hz / 1000);
|
||||
if (metrics.width(text) + 2 < s->hzToX(hz + hzBase) - x)
|
||||
if (metrics.size(0, text).width() + 2 < s->hzToX(hz + hzBase) - x)
|
||||
painter.drawText(x - topLeft.x() + offsetLeft + 1, 0, 0, height(), Qt::TextDontClip | Qt::AlignCenter, text);
|
||||
}
|
||||
|
||||
@@ -125,7 +125,7 @@ void FrequencyPlotHRuler::paintEvent(QPaintEvent*)
|
||||
void FrequencyPlotHRuler::wheelEvent(QWheelEvent* event)
|
||||
{
|
||||
FrequencyPlotView* view = qobject_cast<FrequencyPlotView*>(parentWidget());
|
||||
view->zoom(event->angleDelta().y(), 0, event->x() - view->viewportMargins().left(), 0);
|
||||
view->zoom(event->angleDelta().y(), 0, event->position().x() - view->viewportMargins().left(), 0);
|
||||
}
|
||||
|
||||
void FrequencyPlotHRuler::mouseMoveEvent(QMouseEvent* event)
|
||||
|
||||
@@ -101,5 +101,5 @@ void FrequencyPlotVRuler::wheelEvent(QWheelEvent* event)
|
||||
void FrequencyPlotVRuler::mouseMoveEvent(QMouseEvent* event)
|
||||
{
|
||||
FrequencyPlotView* view = qobject_cast<FrequencyPlotView*>(parentWidget());
|
||||
view->setLastMousePos(QPoint(0, min(event->y(), view->viewport()->height() - 1)));
|
||||
view->setLastMousePos(QPoint(0, fmin(event->y(), view->viewport()->height() - 1)));
|
||||
}
|
||||
@@ -179,7 +179,7 @@ void FrequencyPlotView::wheelEvent(QWheelEvent* event)
|
||||
{
|
||||
event->accept();
|
||||
int delta = event->angleDelta().y();
|
||||
zoom(delta, delta, event->x(), event->y());
|
||||
zoom(delta, delta, event->position().x(), event->position().y());
|
||||
}
|
||||
|
||||
void FrequencyPlotView::scrollContentsBy(int dx, int dy)
|
||||
|
||||
@@ -28,7 +28,7 @@ MiddleClickTabBar::MiddleClickTabBar(QWidget* parent)
|
||||
|
||||
void MiddleClickTabBar::mouseReleaseEvent(QMouseEvent* event)
|
||||
{
|
||||
if (event->button() == Qt::MidButton)
|
||||
if (event->button() == Qt::MiddleButton)
|
||||
{
|
||||
int tabIndex = tabAt(event->pos());
|
||||
if (tabIndex != -1)
|
||||
|
||||
@@ -40,8 +40,8 @@ QSize ResizingLineEdit::sizeHint() const
|
||||
QSize originalSize = QLineEdit::sizeHint();
|
||||
|
||||
QFontMetrics metrics = fontMetrics();
|
||||
QSize contentSize(metrics.width(text()), metrics.height());
|
||||
QStyleOptionFrameV2 opt;
|
||||
QSize contentSize(metrics.size(0, text()));
|
||||
QStyleOptionFrame opt;
|
||||
initStyleOption(&opt);
|
||||
|
||||
QSize size = style()->sizeFromContents(QStyle::CT_LineEdit, &opt, contentSize, this);
|
||||
|
||||
Reference in new issue
Block a user