jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-17 07:52:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebase changes.

Browse source
This commit is contained in:
Lukas Brübach 2025-01-23 10:03:45 +01:00
parent a627d77445
commit 238fb76501
6 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
View file

@ -14,7 +14,7 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);
banner = new BannerWidget(bannerText, Qt::Orientation::Vertical, bannerOpacity, this); banner = new BannerWidget(this, bannerText, Qt::Orientation::Vertical, bannerOpacity);
layout->addWidget(banner); layout->addWidget(banner);
displayCards(); displayCards();

2
cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp
View file

@ -14,7 +14,7 @@ OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *pare
setLayout(layout); setLayout(layout);
setMinimumSize(QSize(0, 0)); 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); overlapWidget = new OverlapWidget(this, 80, 1, 1, Qt::Vertical, true);
layout->addWidget(banner); layout->addWidget(banner);

2
cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.cpp
View file

@ -10,7 +10,7 @@ DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListModel *deck_li
main_layout = new QHBoxLayout(); main_layout = new QHBoxLayout();
this->setLayout(main_layout); 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); this->main_layout->addWidget(flow_widget);
mana_curve_widget = new ManaCurveWidget(flow_widget); mana_curve_widget = new ManaCurveWidget(flow_widget);

2
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp
View file

@ -26,7 +26,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
main_layout = new QVBoxLayout(); main_layout = new QVBoxLayout();
setLayout(main_layout); 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); main_layout->addWidget(flow_widget);
overlap_control_widget = new OverlapControlWidget(80, 10, 10, Qt::Vertical, flow_widget); overlap_control_widget = new OverlapControlWidget(80, 10, 10, Qt::Vertical, flow_widget);

6
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
View file

@ -6,15 +6,11 @@
#include "../../../../game/cards/card_database_manager.h" #include "../../../../game/cards/card_database_manager.h"
#include "../../../../main.h" #include "../../../../main.h"
#include "../../../../utility/card_info_comparator.h" #include "../../../../utility/card_info_comparator.h"
#include "../../layouts/flow_layout.h"
#include "../../layouts/overlap_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/card_info_picture_with_text_overlay_widget.h"
#include "../cards/deck_card_zone_display_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/flow_widget.h"
#include "../general/layout_containers/overlap_control_widget.h" #include "../general/layout_containers/overlap_control_widget.h"
#include "../general/layout_containers/overlap_widget.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QResizeEvent> #include <QResizeEvent>
@ -56,7 +52,7 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *d
scrollArea->addScrollBarWidget(zoneContainer, Qt::AlignHCenter); scrollArea->addScrollBarWidget(zoneContainer, Qt::AlignHCenter);
scrollArea->setWidget(zoneContainer); 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); overlap_control_widget = new OverlapControlWidget(80, 1, 1, Qt::Vertical, this);

2
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h
View file

@ -3,8 +3,6 @@
#include "../../../../deck/deck_list_model.h" #include "../../../../deck/deck_list_model.h"
#include "../../../../game/cards/card_database.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 "../cards/card_info_picture_with_text_overlay_widget.h"
#include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/flow_widget.h"
#include "../general/layout_containers/overlap_control_widget.h" #include "../general/layout_containers/overlap_control_widget.h"