jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-13 21:40:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[QtUtils] Adopt shared Qt helpers across the client (#7618)

Browse source 
* [QtUtils] Add parent lookup, layout clearing, scroll area and monospace helpers

* [QtUtils] Adopt shared Qt helpers across the client

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-10-24 08:26:21 +02:00 • committed by GitHub
parent 1e0fc35d94
commit ab13a6748f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 60 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
View file

@ -16,6 +16,7 @@
#include <QString>
#include <QStringList>
#include <QWidget>
#include <libcockatrice/utility/qt_utils.h>
#include <qtmetamacros.h>
class QFrame;
@ -131,13 +132,9 @@ protected:
// If popup is not open, forward event to parent scroll area
if (!combo->view()->isVisible()) {
// Try to find a scrollable parent and manually send the event
QWidget *parent = combo->parentWidget();
while (parent) {
if (auto *scroll = qobject_cast<QAbstractScrollArea *>(parent)) {
QApplication::sendEvent(scroll->viewport(), event);
return true; // Mark event as handled
}
parent = parent->parentWidget();
if (auto *scroll = QtUtils::findParentOfType<QAbstractScrollArea>(combo)) {
QApplication::sendEvent(scroll->viewport(), event);
return true; // Mark event as handled
}
// If no scrollable parent found, just block
return true;

6
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
View file

@ -33,6 +33,7 @@
#include <libcockatrice/settings/cards_display_settings.h>
#include <libcockatrice/settings/paths_settings.h>
#include <libcockatrice/settings/visual_deck_storage_settings.h>
#include <libcockatrice/utility/qt_utils.h>
#include <qnamespace.h>
VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent)
@ -98,10 +99,7 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
&VisualDeckStorageWidget::updateSelectionAnimationEnabled);
// deck area
scrollArea = new QScrollArea(this);
scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
scrollArea->setWidgetResizable(true);
scrollArea = QtUtils::makeScrollArea(this);
// putting everything together
layout->addWidget(searchAndSortContainer);