jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-09 11:33:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[Game] Make scale on mouseover instant and independent of hover zoom (#7817)

Browse source
This commit is contained in:
RickyRister 2026-11-09 05:52:19 -07:00 • committed by GitHub
parent 7709184ecc
commit 18388d9994
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
cockatrice/src/game_graphics/board/abstract_card_item.cpp
View file

@ -48,8 +48,7 @@ class QSizeF;
// Width the hovered card smooth-zooms to: exactly the hover panel picture size, so // Width the hovered card smooth-zooms to: exactly the hover panel picture size, so
// all four corners coincide when the panel swaps in over it. // all four corners coincide when the panel swaps in over it.
static constexpr qreal HOVER_ZOOM_WIDTH = 270.0; static constexpr qreal HOVER_ZOOM_WIDTH = 270.0;
// The pre-panel hover enlargement. This stays the hover behavior when the smooth zoom is // The pre-panel hover enlargement, used for scaleCards
// turned off (see setHoverHighlighted).
static constexpr qreal LEGACY_HOVER_SCALE = 1.1; static constexpr qreal LEGACY_HOVER_SCALE = 1.1;
static constexpr int HOVER_ZOOM_IN_MS = 220; static constexpr int HOVER_ZOOM_IN_MS = 220;
static constexpr int HOVER_ZOOM_OUT_MS = 140; static constexpr int HOVER_ZOOM_OUT_MS = 140;
@ -324,7 +323,7 @@ void AbstractCardItem::setHoverZoomed(bool _hoverZoomed)
// The target is constant ON-SCREEN pixels: divide out the board view zoom so // The target is constant ON-SCREEN pixels: divide out the board view zoom so
// fullscreen (or zoomed) boards don't overshoot while the fixed-size panel matches. // fullscreen (or zoomed) boards don't overshoot while the fixed-size panel matches.
qreal target = 1.0; qreal target = 1.0;
if (_hoverZoomed && SettingsCache::instance().cardsDisplay().getScaleCards()) { if (_hoverZoomed) {
const qreal w = boundingRect().width(); const qreal w = boundingRect().width();
qreal viewScale = 1.0; qreal viewScale = 1.0;
if (scene() && !scene()->views().isEmpty()) { if (scene() && !scene()->views().isEmpty()) {
@ -360,22 +359,14 @@ void AbstractCardItem::setHovered(bool _hovered)
setZValue(ZValues::HOVERED_CARD); setZValue(ZValues::HOVERED_CARD);
} }
// Fallback to the historical hover scale when the smooth hover zoom is turned off and // contact alone must snap the card to 1.1x while scaleCards is on.
// the panel is not driven by hover: contact alone must still enlarge the card to the if (SettingsCache::instance().cardsDisplay().getScaleCards()) {
// old 1.1x while scaleCards is on.
auto &display = SettingsCache::instance().cardsDisplay();
const bool legacyHoverScale = display.getScaleCards() &&
display.getHoverZoomTrigger() == CardsDisplaySettings::HoverPanelTriggerOff &&
display.getHoverPanelTrigger() != CardsDisplaySettings::HoverPanelTriggerHover;
if (legacyHoverScale) {
// Centered like the smooth zoom, so growing and shrinking never drift. // Centered like the smooth zoom, so growing and shrinking never drift.
setTransformOriginPoint(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F); setTransformOriginPoint(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F);
hoverZoom->stop(); setScale(_hovered ? LEGACY_HOVER_SCALE : 1.0);
hoverZoom->setStartValue(scale()); }
hoverZoom->setEndValue(_hovered ? LEGACY_HOVER_SCALE : 1.0);
hoverZoom->setDuration(_hovered ? HOVER_ZOOM_IN_MS : HOVER_ZOOM_OUT_MS); if (!_hovered && !isHoverZoomed && hoverZoom->state() != QAbstractAnimation::Running) {
hoverZoom->start();
} else if (!_hovered && !isHoverZoomed && hoverZoom->state() != QAbstractAnimation::Running) {
// A zoomed card keeps its raised z until the shrink-out finishes (its finished // A zoomed card keeps its raised z until the shrink-out finishes (its finished
// handler restores it); a highlight-only card has nothing to unwind. // handler restores it); a highlight-only card has nothing to unwind.
setZValue(realZValue); setZValue(realZValue);