mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-09 19:43:26 -08:00
* [DeckList] Apply include-what-you-use to libcockatrice_deck_list * [IWYU] Apply include-what-you-use across the tree Run one whole-tree IWYU pass over the libcockatrice_* libraries, the Cockatrice client, Oracle, Servatrice and the test suite, so each translation unit includes what it uses directly and forward-declares what it does not need. IWYU only analyses real translation units, never the moc code CMake generates from Q_OBJECT headers, so it strips includes that moc output silently relies on. Where a type is passed by value (or nested in a QList/QMap) in a signal or slot signature, the generated moc code needs the complete type; those includes are kept with an explanatory `// IWYU pragma: keep`. The same holds for Q_DECLARE_METATYPE targets such as QSqlDatabase. A handful of includes are added by hand where callers brace-initialize a const-reference parameter, which also requires the complete type. Applied as a single commit on purpose: stripping includes from the libcockatrice_* headers is precisely what breaks the client, test and server translation units, and the fixes for those live in the same translation units. Splitting by component would therefore leave intermediate commits that do not compile. All 426 modified Q_OBJECT/Q_GADGET headers were verified to be moc-self-contained by compiling each generated moc_*.cpp standalone; several built only because of moc include ordering in mocs_compilation.cpp before the keep-includes were added. * [Tooling] Emit public Qt headers and fix IWYU fallout CI found Three problems the local build could not see, all because a green local build only proves the configuration it was run under. Private Qt headers. IWYU emitted private, lowercase Qt headers, and qtypes.h does not exist at all before Qt 6.9, so the Debian 12 and Ubuntu 24.04 jobs on Qt 6.4.2 failed to compile. The generator only emitted a mapping when the capital header name mirrored the private one (QAbstractAnimation for qabstractanimation.h), so qtypes.h, which is wrapped by QtTypes instead, got no mapping and kept the private spelling. Map it explicitly to <QtTypes>, which is public since Qt 5 and provides the same typedefs either way, and rewrite the 100 affected includes. Do not generalize this to "prefer any Qt* wrapper". The table is generated from whichever Qt is installed, and the wrappers are not equally old: QtLogging only appeared in Qt 6.8 and QtMinMax in 6.5, so that heuristic trades one breakage for another. Every other lowercase header still in the tree has shipped publicly since Qt 5, so those are left alone. Platform-guarded includes. IWYU only sees the preprocessor configuration it is handed, so it dropped an include that only the macOS branch of main.cpp needs, and the macOS jobs failed on an undeclared UrlSchemeEventFilter. Restore the include. Force-compiling every file that carries a platform guard under Q_OS_MAC, Q_OS_MACOS and __APPLE__ reports nothing else, so the macOS branches are covered rather than assumed. shellcheck. Drop a leftover variable and stop assigning the include-what-you-use lookup, which was only ever an existence check. * [Tooling] Map Qt 6.5+ split headers to QtGlobal for Qt 6.4 compatibility IWYU emitted QtTypes, QtPreprocessorSupport, QtVersionChecks, QtAssert, QtMinMax, QtClassHelperMacros, QtEnvironmentVariables and QtTranslation. Qt 6.5 split those declarations out of qglobal.h into separate headers, so neither the Qt* wrapper nor the q*.h private name exists on the oldest Qt we support (6.4.2), and Debian 12 / Ubuntu 24.04 fail with "No such file or directory". qtypes.h is worse still: it only appeared in Qt 6.9. QtGlobal is the one spelling that works across the whole supported range. It has been public since Qt 5, defines these declarations itself up to Qt 6.4, and includes the split headers from Qt 6.5 on, so redirect all eight private headers to it and collapse the affected includes in the tree. Curated overrides now take precedence over the name-mirroring rule, which cannot know about Qt version floors because the mapping is generated from whatever Qt is installed. That rule was mapping qtversionchecks.h to <QtVersionChecks> even with an override present, because the override was only consulted as a fallback. A curated key that matches nothing is now a hard error rather than a silent fallback, and the redirected headers are no longer advertised as the home of a symbol. Verified every Qt include in the tree resolves against the real qt6-base-dev 6.4.2 package: 15 distinct includes, 0 missing. * [Tooling] Map QOverload to QtGlobal and drop the QMetaMethodArgument include Two more headers IWYU emitted do not exist on Qt 6.4.2: QOverload was split out of qglobal.h in Qt 6.5, so on 6.4.2 it is declared in qglobal.h directly and the standalone header is a hard error. QtGlobal covers both, so map qoverload.h to it like the other 6.5+ split headers. QMetaMethodArgument is never referenced anywhere in the tree. It is a bare forwarder for qobjectdefs.h that our generator advertised as a class symbol, which is how IWYU came to add the include at all. The symbol mappings are generated from header names, so they cannot tell a forwarder that happens to be capitalised from a real class; removing the unused include is the fix, and the generic case stays a known limitation of the generator. Extending the audit to every Q* header (an earlier pass only matched headers starting with "Qt" or lowercase q*.h, so it missed all of them) against the real qt6-base-dev, qt6-multimedia-dev, qt6-declarative-dev, qt6-svg-dev and qt6-websockets-dev 6.4.2 packages: 341 distinct Qt includes, 0 missing. * [Game] Give moc the complete CardItem type in player_actions.h player_actions.h forward declares CardItem but passes QList<CardItem *> by value in actPlay/actPlayFacedown/actHide. moc instantiates the metatype for those parameters, and on Qt 6.4 that expands to sizeof(CardItem), so Ubuntu 24.04 fails with "invalid application of 'sizeof' to incomplete type 'CardItem'". Newer Qt tolerates the incomplete type, which is why only the 6.4.2 jobs failed. Include the defining header with an IWYU pragma keep, matching how the other MOC-required includes in this area are handled. * [Game] Give moc the complete ServerInfo_Card type player_logic.h, game_scene.h, view_zone.h and view_zone_widget.h forward declare ServerInfo_Card but pass QList<const ServerInfo_Card *> through signal and slot signatures. moc instantiates the metatype for those parameters, which Qt 6.4 expands to sizeof(ServerInfo_Card), so the connect in game_scene.cpp fails on Debian 12 and Ubuntu 24.04 with "invalid application of 'sizeof' to incomplete type 'const ServerInfo_Card'". Newer Qt tolerates it, so only the 6.4.2 jobs failed. Include the generated protobuf header with an IWYU pragma keep, following the pattern already used for ServerInfo_Player and ServerInfo_User in game_event_handler.h. * [Client] Complete the types Qt 6.4 needs for connect and moc Qt 6.4 expands QMetaType::fromType on the normalised argument list of a PMF connect and on moc-generated metatypes, which requires sizeof on every signal and slot parameter. Newer Qt tolerates forward declarations there, so only the Debian 12 and Ubuntu 24.04 jobs failed, with "invalid application of 'sizeof' to incomplete type" for QMouseEvent, QPrinter and GameReplay. Replace the forward declarations with the real includes: - QMouseEvent in the nine widget headers that pass it through signals - QPrinter in abstract_tab_deck_editor.cpp, for the actPrintDeck lambda - game_replay.pb.h in tab_replays.h. GameReplay is a protobuf message, so the project's game/replay.h only forward declares it and cannot supply the complete type. Found by recompiling all 1918 project TUs against the Debian Qt 6.4.2 headers, which reproduces those two CI jobs locally in one pass. * [Client] Complete Release and QMenu for Qt 6.4 moc and connect Continuing the Qt 6.4 complete-type sweep: - window_main.cpp connects ClientUpdateChecker::finishedCheck to MainWindow::checkClientUpdatesFinished, whose Release * parameter made moc 6.4 instantiate the metatype. GameReplay turned out to be a protobuf message, so Release likewise needed release_channel.h in the three headers declaring those signals: window_main.h, dlg_update.h and client_update_checker.h. - moc 6.4 also needs sizeof(QMenu) for the QList<QMenu *> carried by TabSupervisor::setMenu and MainWindow::updateTabMenu. Verified by regenerating moc output with the Debian moc 6.4.2 for all 434 Q_OBJECT/Q_GADGET classes and compiling it, plus recompiling all 1612 source TUs, against the Qt 6.4.2 headers: no remaining failures. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
622 lines
23 KiB
C++
622 lines
23 KiB
C++
#include "view_zone_widget.h"
|
|
|
|
#include "../../client/settings/cache_settings.h"
|
|
#include "../../client/translation.h"
|
|
#include "../../filters/syntax_help.h"
|
|
#include "../../game/board/card_list.h"
|
|
#include "../../game/player/player_actions.h"
|
|
#include "../../game/player/player_logic.h"
|
|
#include "../../game/zones/card_zone_logic.h"
|
|
#include "../../game/zones/view_zone_logic.h"
|
|
#include "../../interface/pixel_map_generator.h"
|
|
#include "../card_dimensions.h"
|
|
#include "../z_values.h"
|
|
#include "libcockatrice/utility/macros.h"
|
|
#include "view_zone.h"
|
|
|
|
#include <QAction>
|
|
#include <QCheckBox>
|
|
#include <QCloseEvent>
|
|
#include <QDebug>
|
|
#include <QEvent>
|
|
#include <QFlags>
|
|
#include <QFrame>
|
|
#include <QGraphicsItem>
|
|
#include <QGraphicsLayout>
|
|
#include <QGraphicsLinearLayout>
|
|
#include <QGraphicsProxyWidget>
|
|
#include <QGraphicsScene>
|
|
#include <QGraphicsSceneMouseEvent>
|
|
#include <QGraphicsSceneResizeEvent>
|
|
#include <QGraphicsView>
|
|
#include <QIcon>
|
|
#include <QObject>
|
|
#include <QRect>
|
|
#include <QScrollBar>
|
|
#include <QSizeF>
|
|
#include <QSizePolicy>
|
|
#include <QString>
|
|
#include <QStringLiteral>
|
|
#include <QStyle>
|
|
#include <QStyleOption>
|
|
#include <QStyleOptionTitleBar>
|
|
#include <QTimer>
|
|
#include <QVariant>
|
|
#include <QWidget>
|
|
#include <QtGlobal>
|
|
#include <libcockatrice/protocol/pb/command_shuffle.pb.h>
|
|
#include <libcockatrice/settings/cards_display_settings.h>
|
|
#include <libcockatrice/settings/interface_settings.h>
|
|
#include <qnamespace.h>
|
|
|
|
namespace
|
|
{
|
|
constexpr qreal kTitleBarHeight = 24.0;
|
|
constexpr qreal kMinVisibleWidth = 100.0;
|
|
} // namespace
|
|
|
|
/**
|
|
* @param _player the player the cards were revealed to.
|
|
* @param _origZone the zone the cards were revealed from.
|
|
* @param numberCards num of cards to reveal from the zone. Ex: scry the top 3 cards.
|
|
* Pass in a negative number to reveal the entire zone.
|
|
* -1 specifically will give the option to shuffle the zone upon closing the window.
|
|
* @param _revealZone if false, the cards will be face down.
|
|
* @param _writeableRevealZone whether the player can interact with the revealed cards.
|
|
*/
|
|
ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player,
|
|
CardZoneLogic *_origZone,
|
|
int numberCards,
|
|
bool _revealZone,
|
|
bool _writeableRevealZone,
|
|
const QList<const ServerInfo_Card *> &cardList,
|
|
bool _isReversed)
|
|
: QGraphicsWidget(0, Qt::Window), canBeShuffled(_origZone->getIsShufflable()), player(_player)
|
|
{
|
|
setAcceptHoverEvents(true);
|
|
setAttribute(Qt::WA_DeleteOnClose);
|
|
setZValue(ZValues::ZONE_VIEW_WIDGET);
|
|
setFlag(ItemIgnoresTransformations);
|
|
|
|
QGraphicsLinearLayout *vbox = new QGraphicsLinearLayout(Qt::Vertical);
|
|
vbox->setSpacing(2);
|
|
|
|
// If the number is < 0, then it means that we can give the option to make the area sorted
|
|
if (numberCards < 0) {
|
|
// search edit
|
|
searchEdit.setFocusPolicy(Qt::ClickFocus);
|
|
searchEdit.setPlaceholderText(tr("Search by card name (or search expressions)"));
|
|
searchEdit.setClearButtonEnabled(true);
|
|
searchEdit.addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
|
|
auto help = searchEdit.addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
|
|
|
|
connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(&searchEdit); });
|
|
|
|
if (SettingsCache::instance().userInterface().getFocusCardViewSearchBar()) {
|
|
this->setActive(true);
|
|
searchEdit.setFocus();
|
|
}
|
|
|
|
QGraphicsProxyWidget *searchEditProxy = new QGraphicsProxyWidget;
|
|
searchEditProxy->setWidget(&searchEdit);
|
|
searchEditProxy->setZValue(ZValues::DRAG_ITEM);
|
|
vbox->addItem(searchEditProxy);
|
|
|
|
// hide search bar if chat autofocus setting is enabled, since typing into it will no longer work anyway
|
|
searchEditProxy->setVisible(!SettingsCache::instance().userInterface().getKeepGameChatFocus());
|
|
connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::keepGameChatFocusChanged,
|
|
searchEditProxy, [searchEditProxy](bool keepFocus) { searchEditProxy->setVisible(!keepFocus); });
|
|
|
|
// top row
|
|
QGraphicsLinearLayout *hTopRow = new QGraphicsLinearLayout(Qt::Horizontal);
|
|
|
|
// groupBy options
|
|
QGraphicsProxyWidget *groupBySelectorProxy = new QGraphicsProxyWidget;
|
|
groupBySelectorProxy->setWidget(&groupBySelector);
|
|
groupBySelectorProxy->setZValue(ZValues::TOP_UI);
|
|
hTopRow->addItem(groupBySelectorProxy);
|
|
|
|
// sortBy options
|
|
QGraphicsProxyWidget *sortBySelectorProxy = new QGraphicsProxyWidget;
|
|
sortBySelectorProxy->setWidget(&sortBySelector);
|
|
sortBySelectorProxy->setZValue(ZValues::DRAG_ITEM);
|
|
hTopRow->addItem(sortBySelectorProxy);
|
|
|
|
vbox->addItem(hTopRow);
|
|
|
|
// line
|
|
QGraphicsProxyWidget *lineProxy = new QGraphicsProxyWidget;
|
|
QFrame *line = new QFrame;
|
|
line->setFrameShape(QFrame::HLine);
|
|
line->setFrameShadow(QFrame::Sunken);
|
|
lineProxy->setWidget(line);
|
|
vbox->addItem(lineProxy);
|
|
|
|
// bottom row
|
|
QGraphicsLinearLayout *hBottomRow = new QGraphicsLinearLayout(Qt::Horizontal);
|
|
|
|
// pile view options
|
|
QGraphicsProxyWidget *pileViewProxy = new QGraphicsProxyWidget;
|
|
pileViewProxy->setWidget(&pileViewCheckBox);
|
|
hBottomRow->addItem(pileViewProxy);
|
|
|
|
// shuffle options
|
|
if (_origZone->getIsShufflable() && numberCards == -1) {
|
|
shuffleCheckBox.setChecked(true);
|
|
QGraphicsProxyWidget *shuffleProxy = new QGraphicsProxyWidget;
|
|
shuffleProxy->setWidget(&shuffleCheckBox);
|
|
hBottomRow->addItem(shuffleProxy);
|
|
}
|
|
|
|
vbox->addItem(hBottomRow);
|
|
}
|
|
|
|
extraHeight = vbox->sizeHint(Qt::PreferredSize).height();
|
|
|
|
QGraphicsLinearLayout *zoneHBox = new QGraphicsLinearLayout(Qt::Horizontal);
|
|
|
|
zoneContainer = new QGraphicsWidget(this);
|
|
zoneContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
|
zoneContainer->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
|
|
zoneHBox->addItem(zoneContainer);
|
|
|
|
scrollBar = new QScrollBar(Qt::Vertical);
|
|
scrollBar->setMinimum(0);
|
|
scrollBar->setSingleStep(20);
|
|
scrollBar->setPageStep(200);
|
|
connect(scrollBar, &QScrollBar::valueChanged, this, &ZoneViewWidget::handleScrollBarChange);
|
|
scrollBarProxy = new ScrollableGraphicsProxyWidget;
|
|
scrollBarProxy->setWidget(scrollBar);
|
|
zoneHBox->addItem(scrollBarProxy);
|
|
|
|
vbox->addItem(zoneHBox);
|
|
|
|
zone = new ZoneViewZone(new ZoneViewZoneLogic(player, _origZone, numberCards, _revealZone, _writeableRevealZone,
|
|
_isReversed, zoneContainer),
|
|
zoneContainer);
|
|
connect(zone, &ZoneViewZone::wheelEventReceived, scrollBarProxy, &ScrollableGraphicsProxyWidget::recieveWheelEvent);
|
|
|
|
retranslateUi();
|
|
|
|
// only wire up sort options after creating ZoneViewZone, since it segfaults otherwise.
|
|
if (numberCards < 0) {
|
|
connect(&groupBySelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
|
|
&ZoneViewWidget::processGroupBy);
|
|
connect(&sortBySelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
|
|
&ZoneViewWidget::processSortBy);
|
|
connect(&pileViewCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &ZoneViewWidget::processSetPileView);
|
|
groupBySelector.setCurrentIndex(SettingsCache::instance().userInterface().getZoneViewGroupByIndex());
|
|
sortBySelector.setCurrentIndex(SettingsCache::instance().userInterface().getZoneViewSortByIndex());
|
|
pileViewCheckBox.setChecked(SettingsCache::instance().userInterface().getZoneViewPileView());
|
|
|
|
if (CardList::NoSort == static_cast<CardList::SortOption>(groupBySelector.currentData().toInt())) {
|
|
pileViewCheckBox.setEnabled(false);
|
|
}
|
|
|
|
connect(&searchEdit, &QLineEdit::textChanged, zone, &ZoneViewZone::setFilterString);
|
|
|
|
const auto applyCardSearchLanguage = [this] { zone->setFilterString(searchEdit.text()); };
|
|
connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
|
|
applyCardSearchLanguage);
|
|
connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this,
|
|
applyCardSearchLanguage);
|
|
}
|
|
|
|
setLayout(vbox);
|
|
|
|
connect(zone, &ZoneViewZone::optimumRectChanged, this, [this] { resizeToZoneContents(); });
|
|
connect(zone, &ZoneViewZone::closed, this, &ZoneViewWidget::zoneDeleted);
|
|
zone->initializeCards(cardList);
|
|
|
|
// QLabel sizes aren't taken into account until the widget is rendered.
|
|
// Force refresh after 1ms to fix glitchy rendering with long QLabels.
|
|
auto *lastResizeBeforeVisibleTimer = new QTimer(this);
|
|
connect(lastResizeBeforeVisibleTimer, &QTimer::timeout, this, [=, this] {
|
|
resizeToZoneContents();
|
|
disconnect(lastResizeBeforeVisibleTimer);
|
|
lastResizeBeforeVisibleTimer->deleteLater();
|
|
});
|
|
lastResizeBeforeVisibleTimer->setSingleShot(true);
|
|
lastResizeBeforeVisibleTimer->start(1);
|
|
}
|
|
|
|
void ZoneViewWidget::processGroupBy(int index)
|
|
{
|
|
auto option = static_cast<CardList::SortOption>(groupBySelector.itemData(index).toInt());
|
|
SettingsCache::instance().userInterface().setZoneViewGroupByIndex(index);
|
|
zone->setGroupBy(option);
|
|
|
|
// disable pile view checkbox if we're not grouping by anything
|
|
pileViewCheckBox.setEnabled(option != CardList::NoSort);
|
|
|
|
// reset sortBy if it has the same value as groupBy
|
|
if (option != CardList::NoSort &&
|
|
option == static_cast<CardList::SortOption>(sortBySelector.currentData().toInt())) {
|
|
sortBySelector.setCurrentIndex(1); // set to SortByName
|
|
}
|
|
}
|
|
|
|
void ZoneViewWidget::processSortBy(int index)
|
|
{
|
|
auto option = static_cast<CardList::SortOption>(sortBySelector.itemData(index).toInt());
|
|
|
|
// set to SortByName instead if it has the same value as groupBy
|
|
if (option != CardList::NoSort &&
|
|
option == static_cast<CardList::SortOption>(groupBySelector.currentData().toInt())) {
|
|
sortBySelector.setCurrentIndex(1); // set to SortByName
|
|
return;
|
|
}
|
|
|
|
SettingsCache::instance().userInterface().setZoneViewSortByIndex(index);
|
|
zone->setSortBy(option);
|
|
}
|
|
|
|
void ZoneViewWidget::processSetPileView(QT_STATE_CHANGED_T value)
|
|
{
|
|
SettingsCache::instance().userInterface().setZoneViewPileView(value);
|
|
zone->setPileView(value);
|
|
}
|
|
|
|
void ZoneViewWidget::retranslateUi()
|
|
{
|
|
setWindowTitle(zone->getLogic()->getTranslatedName(false, CaseNominative));
|
|
|
|
{ // We can't change the strings after they're put into the QComboBox, so this is our workaround
|
|
int oldIndex = groupBySelector.currentIndex();
|
|
groupBySelector.clear();
|
|
groupBySelector.addItem(tr("Ungrouped"), CardList::NoSort);
|
|
groupBySelector.addItem(tr("Group by Type"), CardList::SortByMainType);
|
|
groupBySelector.addItem(tr("Group by Mana Value"), CardList::SortByManaValue);
|
|
groupBySelector.addItem(tr("Group by Color"), CardList::SortByColorGrouping);
|
|
groupBySelector.setCurrentIndex(oldIndex);
|
|
}
|
|
|
|
{
|
|
int oldIndex = sortBySelector.currentIndex();
|
|
sortBySelector.clear();
|
|
sortBySelector.addItem(tr("Unsorted"), CardList::NoSort);
|
|
sortBySelector.addItem(tr("Sort by Name"), CardList::SortByName);
|
|
sortBySelector.addItem(tr("Sort by Type"), CardList::SortByType);
|
|
sortBySelector.addItem(tr("Sort by Mana Cost"), CardList::SortByManaCost);
|
|
sortBySelector.addItem(tr("Sort by Colors"), CardList::SortByColors);
|
|
sortBySelector.addItem(tr("Sort by P/T"), CardList::SortByPt);
|
|
sortBySelector.addItem(tr("Sort by Set"), CardList::SortBySet);
|
|
sortBySelector.setCurrentIndex(oldIndex);
|
|
}
|
|
|
|
shuffleCheckBox.setText(tr("shuffle when closing"));
|
|
pileViewCheckBox.setText(tr("pile view"));
|
|
}
|
|
|
|
void ZoneViewWidget::stopWindowDrag()
|
|
{
|
|
if (!draggingWindow) {
|
|
return;
|
|
}
|
|
|
|
draggingWindow = false;
|
|
ungrabMouse();
|
|
}
|
|
|
|
void ZoneViewWidget::startWindowDrag(QGraphicsSceneMouseEvent *event)
|
|
{
|
|
draggingWindow = true;
|
|
dragStartItemPos = pos();
|
|
dragStartScreenPos = event->screenPos();
|
|
dragView = findDragView(event->widget());
|
|
|
|
// need to grab mouse to receive events and not miss initial movement
|
|
grabMouse();
|
|
}
|
|
|
|
QRectF ZoneViewWidget::closeButtonRect(QWidget *styleWidget) const
|
|
{
|
|
const QRectF frameRectF = windowFrameRect();
|
|
|
|
// query the style for the close button position (handles macOS top-left placement)
|
|
// Title bar rect MUST be local (0,0-based) for QStyle
|
|
const QRect titleBarRect(0, 0, static_cast<int>(frameRectF.width()), static_cast<int>(kTitleBarHeight));
|
|
|
|
if (styleWidget) {
|
|
QStyleOptionTitleBar opt;
|
|
opt.initFrom(styleWidget);
|
|
opt.rect = titleBarRect;
|
|
opt.text = windowTitle();
|
|
opt.icon = styleWidget->windowIcon();
|
|
opt.titleBarFlags = Qt::Window | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
|
|
|
|
opt.subControls = QStyle::SC_TitleBarCloseButton;
|
|
opt.activeSubControls = QStyle::SC_TitleBarCloseButton;
|
|
opt.titleBarState = styleWidget->isActiveWindow() ? Qt::WindowActive : Qt::WindowNoState;
|
|
|
|
if (styleWidget->isActiveWindow()) {
|
|
opt.state |= QStyle::State_Active;
|
|
}
|
|
|
|
QRect r = styleWidget->style()->subControlRect(QStyle::CC_TitleBar, &opt, QStyle::SC_TitleBarCloseButton,
|
|
styleWidget);
|
|
|
|
if (r.isValid() && !r.isEmpty()) {
|
|
// Translate from local-titlebar coords → frame coords
|
|
r.translate(frameRectF.topLeft().toPoint());
|
|
return QRectF(r);
|
|
}
|
|
}
|
|
|
|
// Fallback: frame-relative top-right
|
|
return QRectF(frameRectF.right() - kTitleBarHeight, frameRectF.top(), kTitleBarHeight, kTitleBarHeight);
|
|
}
|
|
|
|
QGraphicsView *ZoneViewWidget::findDragView(QWidget *eventWidget) const
|
|
{
|
|
QWidget *current = eventWidget;
|
|
while (current) {
|
|
if (auto *view = qobject_cast<QGraphicsView *>(current)) {
|
|
return view;
|
|
}
|
|
current = current->parentWidget();
|
|
}
|
|
|
|
if (scene() && !scene()->views().isEmpty()) {
|
|
return scene()->views().constFirst();
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
QPointF ZoneViewWidget::calcDraggedWindowPos(const QPoint &screenPos,
|
|
const QPointF &scenePos,
|
|
const QPointF &buttonDownScenePos) const
|
|
{
|
|
if (dragView && dragView->viewport()) {
|
|
const QPoint vpStart = dragView->viewport()->mapFromGlobal(dragStartScreenPos);
|
|
const QPoint vpNow = dragView->viewport()->mapFromGlobal(screenPos);
|
|
const QPointF sceneStart = dragView->mapToScene(vpStart);
|
|
const QPointF sceneNow = dragView->mapToScene(vpNow);
|
|
return dragStartItemPos + (sceneNow - sceneStart);
|
|
}
|
|
|
|
return dragStartItemPos + (scenePos - buttonDownScenePos);
|
|
}
|
|
|
|
bool ZoneViewWidget::windowFrameEvent(QEvent *event)
|
|
{
|
|
if (event->type() == QEvent::UngrabMouse) {
|
|
stopWindowDrag();
|
|
return QGraphicsWidget::windowFrameEvent(event);
|
|
}
|
|
|
|
auto *me = dynamic_cast<QGraphicsSceneMouseEvent *>(event);
|
|
if (!me) {
|
|
return QGraphicsWidget::windowFrameEvent(event);
|
|
}
|
|
|
|
switch (event->type()) {
|
|
case QEvent::GraphicsSceneMousePress:
|
|
if (me->button() == Qt::LeftButton && windowFrameSectionAt(me->pos()) == Qt::TitleBarArea) {
|
|
// avoid drag on close button
|
|
if (closeButtonRect(me->widget()).contains(me->pos())) {
|
|
me->accept();
|
|
close();
|
|
return true;
|
|
}
|
|
|
|
startWindowDrag(me);
|
|
me->accept();
|
|
return true;
|
|
}
|
|
break;
|
|
|
|
case QEvent::GraphicsSceneMouseMove:
|
|
if (draggingWindow) {
|
|
if (!(me->buttons() & Qt::LeftButton)) {
|
|
stopWindowDrag();
|
|
} else {
|
|
setPos(
|
|
calcDraggedWindowPos(me->screenPos(), me->scenePos(), me->buttonDownScenePos(Qt::LeftButton)));
|
|
}
|
|
me->accept();
|
|
return true;
|
|
}
|
|
break;
|
|
|
|
case QEvent::GraphicsSceneMouseRelease:
|
|
if (draggingWindow && me->button() == Qt::LeftButton) {
|
|
stopWindowDrag();
|
|
me->accept();
|
|
return true;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return QGraphicsWidget::windowFrameEvent(event);
|
|
}
|
|
|
|
void ZoneViewWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
|
|
{
|
|
// move if the scene routes moves while dragging
|
|
if (draggingWindow && (event->buttons() & Qt::LeftButton)) {
|
|
setPos(calcDraggedWindowPos(event->screenPos(), event->scenePos(), event->buttonDownScenePos(Qt::LeftButton)));
|
|
event->accept();
|
|
return;
|
|
}
|
|
|
|
QGraphicsWidget::mouseMoveEvent(event);
|
|
}
|
|
|
|
void ZoneViewWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
|
{
|
|
if (draggingWindow && event->button() == Qt::LeftButton) {
|
|
stopWindowDrag();
|
|
event->accept();
|
|
return;
|
|
}
|
|
|
|
QGraphicsWidget::mouseReleaseEvent(event);
|
|
}
|
|
|
|
QVariant ZoneViewWidget::itemChange(GraphicsItemChange change, const QVariant &value)
|
|
{
|
|
if (change == QGraphicsItem::ItemPositionChange && scene()) {
|
|
// Keep grab area in main view
|
|
const QRectF sceneRect = scene()->sceneRect();
|
|
const QPointF requestedPos = value.toPointF();
|
|
QPointF desiredPos = requestedPos;
|
|
|
|
const qreal minX = sceneRect.left();
|
|
const qreal maxX = qMax(minX, sceneRect.right() - kMinVisibleWidth);
|
|
const qreal minY = sceneRect.top() + kTitleBarHeight;
|
|
const qreal maxY = qMax(minY, sceneRect.bottom() - kTitleBarHeight);
|
|
|
|
desiredPos.setX(qBound(minX, desiredPos.x(), maxX));
|
|
desiredPos.setY(qBound(minY, desiredPos.y(), maxY));
|
|
return desiredPos;
|
|
}
|
|
|
|
return QGraphicsWidget::itemChange(change, value);
|
|
}
|
|
|
|
void ZoneViewWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
|
|
{
|
|
// We need to manually resize the scroll bar whenever the window gets resized
|
|
resizeScrollbar(event->newSize().height() - extraHeight - 10);
|
|
}
|
|
|
|
void ZoneViewWidget::resizeScrollbar(const qreal newZoneHeight)
|
|
{
|
|
qreal totalZoneHeight = zone->getOptimumRect().height();
|
|
qreal newMax = qMax(totalZoneHeight - newZoneHeight, 0.0);
|
|
scrollBar->setMaximum(newMax);
|
|
}
|
|
|
|
/**
|
|
* Maps a height that is given as number of rows of cards to the actual height, given in pixels.
|
|
*
|
|
* @param rows Rows of cards
|
|
* @return The height in pixels
|
|
*/
|
|
static qreal rowsToHeight(int rows)
|
|
{
|
|
const qreal cardsHeight = (rows + 1) * (CardDimensions::HEIGHT_F / 3);
|
|
return cardsHeight + 5; // +5 padding to make the cutoff look nicer
|
|
}
|
|
|
|
/**
|
|
* Calculates the max initial height from the settings.
|
|
* The max initial height setting is given as number of rows, so we need to map it to a height.
|
|
**/
|
|
static qreal calcMaxInitialHeight()
|
|
{
|
|
return rowsToHeight(SettingsCache::instance().userInterface().getCardViewInitialRowsMax());
|
|
}
|
|
|
|
/**
|
|
* @brief Handles edge cases in determining the next default zone height. We want the height to snap when the number of
|
|
* rows changes, but not if the player has already expanded the window.
|
|
*/
|
|
static qreal determineNewZoneHeight(qreal oldZoneHeight)
|
|
{
|
|
// don't snap if window is taller than max initial height
|
|
if (oldZoneHeight > calcMaxInitialHeight()) {
|
|
return oldZoneHeight;
|
|
}
|
|
|
|
return calcMaxInitialHeight();
|
|
}
|
|
|
|
void ZoneViewWidget::resizeToZoneContents(bool forceInitialHeight)
|
|
{
|
|
QRectF zoneRect = zone->getOptimumRect();
|
|
qreal totalZoneHeight = zoneRect.height();
|
|
|
|
qreal width = qMax(QGraphicsWidget::layout()->effectiveSizeHint(Qt::MinimumSize, QSizeF()).width(),
|
|
zoneRect.width() + scrollBar->width() + 10);
|
|
|
|
QSizeF maxSize(width, zoneRect.height() + extraHeight + 10);
|
|
|
|
qreal currentZoneHeight = rect().height() - extraHeight - 10;
|
|
qreal newZoneHeight = forceInitialHeight ? calcMaxInitialHeight() : determineNewZoneHeight(currentZoneHeight);
|
|
|
|
QSizeF initialSize(width, newZoneHeight + extraHeight + 10);
|
|
|
|
setMaximumSize(maxSize);
|
|
resize(initialSize);
|
|
resizeScrollbar(newZoneHeight);
|
|
|
|
zone->setGeometry(QRectF(0, -scrollBar->value(), zoneContainer->size().width(), totalZoneHeight));
|
|
|
|
if (layout()) {
|
|
layout()->invalidate();
|
|
}
|
|
}
|
|
|
|
void ZoneViewWidget::handleScrollBarChange(int value)
|
|
{
|
|
zone->setY(-value);
|
|
}
|
|
|
|
void ZoneViewWidget::closeEvent(QCloseEvent *event)
|
|
{
|
|
stopWindowDrag();
|
|
disconnect(zone, &ZoneViewZone::closed, this, 0);
|
|
// manually call zone->close in order to remove it from the origZones views
|
|
zone->close();
|
|
if (shuffleCheckBox.isChecked()) {
|
|
player->getPlayerActions()->sendGameCommand(Command_Shuffle());
|
|
}
|
|
zoneDeleted();
|
|
event->accept();
|
|
}
|
|
|
|
void ZoneViewWidget::zoneDeleted()
|
|
{
|
|
emit closePressed(this);
|
|
deleteLater();
|
|
}
|
|
|
|
void ZoneViewWidget::initStyleOption(QStyleOption *option) const
|
|
{
|
|
QStyleOptionTitleBar *titleBar = qstyleoption_cast<QStyleOptionTitleBar *>(option);
|
|
if (titleBar) {
|
|
titleBar->icon = themePixmap(QStringLiteral("cockatrice"));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Expands/shrinks the window, depending on the current height as well as the configured initial and expanded max
|
|
* heights.
|
|
*/
|
|
void ZoneViewWidget::expandWindow()
|
|
{
|
|
qreal maxInitialHeight = calcMaxInitialHeight();
|
|
qreal maxExpandedHeight = rowsToHeight(SettingsCache::instance().userInterface().getCardViewExpandedRowsMax());
|
|
qreal height = rect().height() - extraHeight - 10;
|
|
qreal maxHeight = maximumHeight() - extraHeight - 10;
|
|
|
|
// reset window to initial max height if...
|
|
bool doResetSize =
|
|
// current height is less than that
|
|
(height < maxInitialHeight) ||
|
|
// current height is at expanded max height
|
|
(height == maxExpandedHeight) ||
|
|
// current height is at actual max height, and actual max height is less than expanded max height
|
|
(height == maxHeight && height > maxInitialHeight && height < maxExpandedHeight);
|
|
|
|
if (doResetSize) {
|
|
resizeToZoneContents(true);
|
|
} else {
|
|
// expand/shrink window to expanded max height if current height is anywhere at or between initial max height
|
|
// and actual max height
|
|
resize(maximumSize().boundedTo({maximumWidth(), maxExpandedHeight + extraHeight + 10}));
|
|
}
|
|
}
|
|
|
|
void ZoneViewWidget::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
|
|
{
|
|
if (event->pos().y() <= 0) {
|
|
expandWindow();
|
|
}
|
|
}
|