jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-18 08:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust enlarged pixmap to consider bounds so it's not drawn off-screen.

Browse source
This commit is contained in:
Lukas Brübach 2025-03-08 09:35:07 +01:00
parent 87a274fee4
commit 17e2eb6229
1 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

39
cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp
View file

@ -248,10 +248,24 @@ void CardInfoPictureWidget::leaveEvent(QEvent *event)
void CardInfoPictureWidget::mouseMoveEvent(QMouseEvent *event) void CardInfoPictureWidget::mouseMoveEvent(QMouseEvent *event)
{ {
QWidget::mouseMoveEvent(event); QWidget::mouseMoveEvent(event);
if (hoverToZoomEnabled && enlargedPixmapWidget->isVisible()) { if (hoverToZoomEnabled && enlargedPixmapWidget->isVisible()) {
const QPointF cursorPos = QCursor::pos(); const QPoint cursorPos = QCursor::pos();
enlargedPixmapWidget->move(QPoint(static_cast<int>(cursorPos.x()) + enlargedPixmapOffset, const QRect screenGeometry = QGuiApplication::screenAt(cursorPos)->geometry();
static_cast<int>(cursorPos.y()) + enlargedPixmapOffset)); const QSize widgetSize = enlargedPixmapWidget->size();
int newX = cursorPos.x() + enlargedPixmapOffset;
int newY = cursorPos.y() + enlargedPixmapOffset;
// Adjust if out of bounds
if (newX + widgetSize.width() > screenGeometry.right()) {
newX = cursorPos.x() - widgetSize.width() - enlargedPixmapOffset;
}
if (newY + widgetSize.height() > screenGeometry.bottom()) {
newY = cursorPos.y() - widgetSize.height() - enlargedPixmapOffset;
}
enlargedPixmapWidget->move(newX, newY);
} }
} }
@ -353,9 +367,22 @@ void CardInfoPictureWidget::showEnlargedPixmap() const
static_cast<int>(size().width() * aspectRatio * scaleFactor)); static_cast<int>(size().width() * aspectRatio * scaleFactor));
enlargedPixmapWidget->setCardPixmap(info, enlargedSize); enlargedPixmapWidget->setCardPixmap(info, enlargedSize);
const QPointF cursorPos = QCursor::pos(); const QPoint cursorPos = QCursor::pos();
enlargedPixmapWidget->move(static_cast<int>(cursorPos.x()) + enlargedPixmapOffset, const QRect screenGeometry = QGuiApplication::screenAt(cursorPos)->geometry();
static_cast<int>(cursorPos.y()) + enlargedPixmapOffset); const QSize widgetSize = enlargedPixmapWidget->size();
int newX = cursorPos.x() + enlargedPixmapOffset;
int newY = cursorPos.y() + enlargedPixmapOffset;
// Adjust if out of bounds
if (newX + widgetSize.width() > screenGeometry.right()) {
newX = cursorPos.x() - widgetSize.width() - enlargedPixmapOffset;
}
if (newY + widgetSize.height() > screenGeometry.bottom()) {
newY = cursorPos.y() - widgetSize.height() - enlargedPixmapOffset;
}
enlargedPixmapWidget->move(newX, newY);
enlargedPixmapWidget->show(); enlargedPixmapWidget->show();
} }