Added magnifier for more precise selections (#2219)
* added a magnifierwidget * added option to show magnifier and added option to switch to square shaped magnifier * integrated magnifierwidget into capture this could probably be done in a nicer way. right now the magnifier wont show if you select via the move tool. Co-authored-by: Silas Dohm <silas@sdohm.xyz>
This commit is contained in:
SilasDo
172
src/widgets/capture/magnifierwidget.cpp
Normal file
172
src/widgets/capture/magnifierwidget.cpp
Normal file
@@ -0,0 +1,172 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
// SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors
|
||||
|
||||
#include "magnifierwidget.h"
|
||||
#include <QApplication>
|
||||
#include <QEvent>
|
||||
#include <QMouseEvent>
|
||||
#include <QPainter>
|
||||
#include <QPainterPath>
|
||||
#include <QPen>
|
||||
#include <QPixmap>
|
||||
|
||||
MagnifierWidget::MagnifierWidget(const QPixmap& p,
|
||||
const QColor& c,
|
||||
bool isSquare,
|
||||
QWidget* parent)
|
||||
: QWidget(parent)
|
||||
, m_color(c)
|
||||
, m_borderColor(c)
|
||||
, m_screenshot(p)
|
||||
, m_square(isSquare)
|
||||
{
|
||||
setFixedSize(parent->width(), parent->height());
|
||||
setAttribute(Qt::WA_TransparentForMouseEvents);
|
||||
m_color.setAlpha(130);
|
||||
// add padding for circular magnifier
|
||||
QImage padded(p.width() + 2 * m_magPixels,
|
||||
p.height() + 2 * m_magPixels,
|
||||
QImage::Format_ARGB32);
|
||||
padded.fill(Qt::black);
|
||||
QPainter painter(&padded);
|
||||
painter.drawPixmap(m_magPixels, m_magPixels, p);
|
||||
m_paddedScreenshot.convertFromImage(padded);
|
||||
}
|
||||
void MagnifierWidget::paintEvent(QPaintEvent*)
|
||||
{
|
||||
QPainter p(this);
|
||||
if (m_square)
|
||||
drawMagnifier(p);
|
||||
else
|
||||
drawMagnifierCircle(p);
|
||||
}
|
||||
|
||||
void MagnifierWidget::drawMagnifierCircle(QPainter& painter)
|
||||
{
|
||||
int x = QCursor::pos().x() + m_magPixels;
|
||||
int y = QCursor::pos().y() + m_magPixels;
|
||||
int magX = static_cast<int>(x * m_devicePixelRatio - m_magPixels);
|
||||
int magY = static_cast<int>(y * m_devicePixelRatio - m_magPixels);
|
||||
QRectF magniRect(magX, magY, m_pixels, m_pixels);
|
||||
|
||||
qreal drawPosX = x + m_magOffset + m_pixels * magZoom / 2;
|
||||
if (drawPosX > width() - m_pixels * magZoom / 2) {
|
||||
drawPosX = x - m_magOffset - m_pixels * magZoom / 2;
|
||||
}
|
||||
qreal drawPosY = y + m_magOffset + m_pixels * magZoom / 2;
|
||||
if (drawPosY > height() - m_pixels * magZoom / 2) {
|
||||
drawPosY = y - m_magOffset - m_pixels * magZoom / 2;
|
||||
}
|
||||
QPointF drawPos(drawPosX, drawPosY);
|
||||
QRectF crossHairTop(drawPos.x() + magZoom * (-0.5),
|
||||
drawPos.y() - magZoom * (m_magPixels + 0.5),
|
||||
magZoom,
|
||||
magZoom * (m_magPixels));
|
||||
QRectF crossHairRight(drawPos.x() + magZoom * (0.5),
|
||||
drawPos.y() + magZoom * (-0.5),
|
||||
magZoom * (m_magPixels),
|
||||
magZoom);
|
||||
QRectF crossHairBottom(drawPos.x() + magZoom * (-0.5),
|
||||
drawPos.y() + magZoom * (0.5),
|
||||
magZoom,
|
||||
magZoom * (m_magPixels));
|
||||
QRectF crossHairLeft(drawPos.x() - magZoom * (m_magPixels + 0.5),
|
||||
drawPos.y() + magZoom * (-0.5),
|
||||
magZoom * (m_magPixels),
|
||||
magZoom);
|
||||
QRectF crossHairBorder(drawPos.x() - magZoom * (m_magPixels + 0.5) - 1,
|
||||
drawPos.y() - magZoom * (m_magPixels + 0.5) - 1,
|
||||
m_pixels * magZoom + 2,
|
||||
m_pixels * magZoom + 2);
|
||||
const auto frag =
|
||||
QPainter::PixmapFragment::create(drawPos, magniRect, magZoom, magZoom);
|
||||
|
||||
painter.setRenderHint(QPainter::Antialiasing, true);
|
||||
QPainterPath path = QPainterPath();
|
||||
path.addEllipse(drawPos, m_pixels * magZoom / 2, m_pixels * magZoom / 2);
|
||||
painter.setClipPath(path);
|
||||
|
||||
painter.drawPixmapFragments(
|
||||
&frag, 1, m_paddedScreenshot, QPainter::OpaqueHint);
|
||||
painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
|
||||
for (auto& rect :
|
||||
{ crossHairTop, crossHairRight, crossHairBottom, crossHairLeft }) {
|
||||
painter.fillRect(rect, m_color);
|
||||
}
|
||||
QPen pen(m_borderColor);
|
||||
pen.setWidth(4);
|
||||
painter.setPen(pen);
|
||||
painter.drawEllipse(
|
||||
drawPos, m_pixels * magZoom / 2, m_pixels * magZoom / 2);
|
||||
}
|
||||
// https://invent.kde.org/graphics/spectacle/-/blob/master/src/QuickEditor/QuickEditor.cpp#L841
|
||||
void MagnifierWidget::drawMagnifier(QPainter& painter)
|
||||
{
|
||||
int x = QCursor::pos().x();
|
||||
int y = QCursor::pos().y();
|
||||
int magX = static_cast<int>(x * m_devicePixelRatio - m_magPixels);
|
||||
int offsetX = 0;
|
||||
if (magX < 0) {
|
||||
offsetX = magX;
|
||||
magX = 0;
|
||||
} else {
|
||||
const int maxX = m_screenshot.width() - m_pixels;
|
||||
if (magX > maxX) {
|
||||
offsetX = magX - maxX;
|
||||
magX = maxX;
|
||||
}
|
||||
}
|
||||
int magY = static_cast<int>(y * m_devicePixelRatio - m_magPixels);
|
||||
int offsetY = 0;
|
||||
if (magY < 0) {
|
||||
offsetY = magY;
|
||||
magY = 0;
|
||||
} else {
|
||||
const int maxY = m_screenshot.height() - m_pixels;
|
||||
if (magY > maxY) {
|
||||
offsetY = magY - maxY;
|
||||
magY = maxY;
|
||||
}
|
||||
}
|
||||
QRectF magniRect(magX, magY, m_pixels, m_pixels);
|
||||
|
||||
qreal drawPosX = x + m_magOffset + m_pixels * magZoom / 2;
|
||||
if (drawPosX > width() - m_pixels * magZoom / 2) {
|
||||
drawPosX = x - m_magOffset - m_pixels * magZoom / 2;
|
||||
}
|
||||
qreal drawPosY = y + m_magOffset + m_pixels * magZoom / 2;
|
||||
if (drawPosY > height() - m_pixels * magZoom / 2) {
|
||||
drawPosY = y - m_magOffset - m_pixels * magZoom / 2;
|
||||
}
|
||||
QPointF drawPos(drawPosX, drawPosY);
|
||||
QRectF crossHairTop(drawPos.x() + magZoom * (offsetX - 0.5),
|
||||
drawPos.y() - magZoom * (m_magPixels + 0.5),
|
||||
magZoom,
|
||||
magZoom * (m_magPixels + offsetY));
|
||||
QRectF crossHairRight(drawPos.x() + magZoom * (0.5 + offsetX),
|
||||
drawPos.y() + magZoom * (offsetY - 0.5),
|
||||
magZoom * (m_magPixels - offsetX),
|
||||
magZoom);
|
||||
QRectF crossHairBottom(drawPos.x() + magZoom * (offsetX - 0.5),
|
||||
drawPos.y() + magZoom * (0.5 + offsetY),
|
||||
magZoom,
|
||||
magZoom * (m_magPixels - offsetY));
|
||||
QRectF crossHairLeft(drawPos.x() - magZoom * (m_magPixels + 0.5),
|
||||
drawPos.y() + magZoom * (offsetY - 0.5),
|
||||
magZoom * (m_magPixels + offsetX),
|
||||
magZoom);
|
||||
QRectF crossHairBorder(drawPos.x() - magZoom * (m_magPixels + 0.5) - 1,
|
||||
drawPos.y() - magZoom * (m_magPixels + 0.5) - 1,
|
||||
m_pixels * magZoom + 2,
|
||||
m_pixels * magZoom + 2);
|
||||
const auto frag =
|
||||
QPainter::PixmapFragment::create(drawPos, magniRect, magZoom, magZoom);
|
||||
|
||||
painter.fillRect(crossHairBorder, m_borderColor);
|
||||
painter.drawPixmapFragments(&frag, 1, m_screenshot, QPainter::OpaqueHint);
|
||||
painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
|
||||
for (auto& rect :
|
||||
{ crossHairTop, crossHairRight, crossHairBottom, crossHairLeft }) {
|
||||
painter.fillRect(rect, m_color);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user