From 238fb765016e90892238a7e65a3acfe84c854198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Thu, 23 Jan 2025 10:03:45 +0100 Subject: [PATCH] Rebase changes. --- .../ui/widgets/cards/deck_card_zone_display_widget.cpp | 2 +- .../widgets/cards/overlapped_card_group_display_widget.cpp | 2 +- .../ui/widgets/deck_analytics/deck_analytics_widget.cpp | 2 +- .../visual_database_display_widget.cpp | 2 +- .../visual_deck_editor/visual_deck_editor_widget.cpp | 6 +----- .../widgets/visual_deck_editor/visual_deck_editor_widget.h | 2 -- 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp index 278174e45..28a20095b 100644 --- a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp @@ -14,7 +14,7 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, layout = new QVBoxLayout(this); setLayout(layout); - banner = new BannerWidget(bannerText, Qt::Orientation::Vertical, bannerOpacity, this); + banner = new BannerWidget(this, bannerText, Qt::Orientation::Vertical, bannerOpacity); layout->addWidget(banner); displayCards(); diff --git a/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp index 7e34a9f6a..934e19367 100644 --- a/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp @@ -14,7 +14,7 @@ OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *pare setLayout(layout); setMinimumSize(QSize(0, 0)); - banner = new BannerWidget(bannerText, Qt::Orientation::Vertical, bannerOpacity, this); + banner = new BannerWidget(this, bannerText, Qt::Orientation::Vertical, bannerOpacity); overlapWidget = new OverlapWidget(this, 80, 1, 1, Qt::Vertical, true); layout->addWidget(banner); diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.cpp index 0fe3ee526..d702f1aca 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.cpp @@ -10,7 +10,7 @@ DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListModel *deck_li main_layout = new QHBoxLayout(); this->setLayout(main_layout); - flow_widget = new FlowWidget(this, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff); + flow_widget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff); this->main_layout->addWidget(flow_widget); mana_curve_widget = new ManaCurveWidget(flow_widget); diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp index c63913da2..91bb2fb5b 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp @@ -26,7 +26,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, main_layout = new QVBoxLayout(); setLayout(main_layout); - flow_widget = new FlowWidget(this, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded); + flow_widget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded); main_layout->addWidget(flow_widget); overlap_control_widget = new OverlapControlWidget(80, 10, 10, Qt::Vertical, flow_widget); diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index a9d638a2e..9d66afbe3 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -6,15 +6,11 @@ #include "../../../../game/cards/card_database_manager.h" #include "../../../../main.h" #include "../../../../utility/card_info_comparator.h" -#include "../../layouts/flow_layout.h" #include "../../layouts/overlap_layout.h" -#include "../../layouts/vertical_flow_layout.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/deck_card_zone_display_widget.h" -#include "../cards/overlapped_card_group_display_widget.h" #include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/overlap_control_widget.h" -#include "../general/layout_containers/overlap_widget.h" #include #include @@ -56,7 +52,7 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *d scrollArea->addScrollBarWidget(zoneContainer, Qt::AlignHCenter); scrollArea->setWidget(zoneContainer); - flowWidget = new FlowWidget(this, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded); + flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded); overlap_control_widget = new OverlapControlWidget(80, 1, 1, Qt::Vertical, this); diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h index 0ea11317a..773660ab4 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h @@ -3,8 +3,6 @@ #include "../../../../deck/deck_list_model.h" #include "../../../../game/cards/card_database.h" -#include "../../layouts/flow_layout.h" -#include "../../layouts/vertical_flow_layout.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/overlap_control_widget.h"