benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed high CPU usage on pin (#2502)

Browse Source
This commit is contained in:
borgmanJeremy
2022-03-25 08:43:51 -05:00
committed by GitHub
parent a6144df367
commit e97f733784
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/tools/pin/pinwidget.cpp
View File

@@ -109,6 +109,8 @@ bool PinWidget::scrollEvent(QWheelEvent* event)
m_currentStepScaleFactor = 1.0;
m_expanding = false;
}
m_sizeChanged = true;
update();
return true;
}
@@ -165,22 +167,27 @@ bool PinWidget::event(QEvent* event)
void PinWidget::paintEvent(QPaintEvent* event)
{
const auto aspectRatio =
m_expanding ? Qt::KeepAspectRatioByExpanding : Qt::KeepAspectRatio;
const auto transformType = ConfigHandler().antialiasingPinZoom()
? Qt::SmoothTransformation
: Qt::FastTransformation;
const qreal iw = m_pixmap.width();
const qreal ih = m_pixmap.height();
const qreal nw = qBound(MIN_SIZE,
iw * m_currentStepScaleFactor * m_scaleFactor,
static_cast<qreal>(maximumWidth()));
const qreal nh = qBound(MIN_SIZE,
ih * m_currentStepScaleFactor * m_scaleFactor,
static_cast<qreal>(maximumHeight()));
const QPixmap pix = m_pixmap.scaled(nw, nh, aspectRatio, transformType);
m_label->setPixmap(pix);
adjustSize();
if (m_sizeChanged) {
const auto aspectRatio =
m_expanding ? Qt::KeepAspectRatioByExpanding : Qt::KeepAspectRatio;
const auto transformType = ConfigHandler().antialiasingPinZoom()
? Qt::SmoothTransformation
: Qt::FastTransformation;
const qreal iw = m_pixmap.width();
const qreal ih = m_pixmap.height();
const qreal nw = qBound(MIN_SIZE,
iw * m_currentStepScaleFactor * m_scaleFactor,
static_cast<qreal>(maximumWidth()));
const qreal nh = qBound(MIN_SIZE,
ih * m_currentStepScaleFactor * m_scaleFactor,
static_cast<qreal>(maximumHeight()));
const QPixmap pix = m_pixmap.scaled(nw, nh, aspectRatio, transformType);
m_label->setPixmap(pix);
adjustSize();
m_sizeChanged = false;
}
}
void PinWidget::pinchTriggered(QPinchGesture* gesture)
@@ -195,5 +202,6 @@ void PinWidget::pinchTriggered(QPinchGesture* gesture)
m_currentStepScaleFactor = 1;
m_expanding = false;
}
m_sizeChanged = true;
update();
}

1
src/tools/pin/pinwidget.h
View File

@@ -45,4 +45,5 @@ private:
bool m_expanding{ false };
qreal m_scaleFactor{ 1 };
qreal m_currentStepScaleFactor{ 1 };
bool m_sizeChanged{ false };
};