From 1b71519ec6d4ff721edc113c6561faa716888e43 Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Fri, 16 Jan 2026 07:11:39 -0800 Subject: [PATCH] [VDE] Make sample hand widget look nicer (#6525) --- .../draw_probability/draw_probability_widget.cpp | 2 ++ .../visual_deck_editor_sample_hand_widget.cpp | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp index 146ab6f1c..4931aeaa4 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp @@ -22,6 +22,7 @@ DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatistics { controls = new QWidget(this); controlLayout = new QHBoxLayout(controls); + controlLayout->setContentsMargins(11, 0, 11, 0); labelPrefix = new QLabel(this); controlLayout->addWidget(labelPrefix); @@ -65,6 +66,7 @@ DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatistics resultTable = new QTableWidget(this); resultTable->setColumnCount(3); resultTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); + resultTable->setEditTriggers(QAbstractItemView::NoEditTriggers); layout->addWidget(resultTable); // Connections diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index fb5ae780c..9e7fb0208 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp @@ -15,10 +15,13 @@ VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *pare : QWidget(parent), deckListModel(_deckListModel), statsAnalyzer(_statsAnalyzer) { layout = new QVBoxLayout(this); + layout->setSpacing(0); setLayout(layout); - resetAndHandSizeContainerWidget = new QWidget(this); resetAndHandSizeLayout = new QHBoxLayout(resetAndHandSizeContainerWidget); + resetAndHandSizeLayout->setContentsMargins(11, 0, 11, 0); + + resetAndHandSizeContainerWidget = new QWidget(this); resetAndHandSizeContainerWidget->setLayout(resetAndHandSizeLayout); resetButton = new QPushButton(this); @@ -39,12 +42,12 @@ VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *pare flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded); layout->addWidget(flowWidget); - drawProbabilityWidget = new DrawProbabilityWidget(this, statsAnalyzer); - layout->addWidget(drawProbabilityWidget); - cardSizeWidget = new CardSizeWidget(this, flowWidget); layout->addWidget(cardSizeWidget); + drawProbabilityWidget = new DrawProbabilityWidget(this, statsAnalyzer); + layout->addWidget(drawProbabilityWidget); + for (const ExactCard &card : getRandomCards(handSizeSpinBox->value())) { auto displayWidget = new CardInfoPictureWidget(this); displayWidget->setCard(card);