From 856cfb7d87a490b3d69dc3d8acf583290e196feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 12 Jan 2025 22:46:55 +0100 Subject: [PATCH] Remove close button (for now) and change "Add tags ..." to "Edit tags ..." --- .../deck_preview_deck_tags_display_widget.cpp | 2 +- .../deck_preview_tag_addition_widget.cpp | 8 +++---- .../deck_preview_tag_display_widget.cpp | 24 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp index 5ecd246c2..e849d2716 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp @@ -26,6 +26,6 @@ DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(DeckPreviewWi for (const QString &tag : this->deckLoader->getTags()) { flowWidget->addWidget(new DeckPreviewTagDisplayWidget(this, tag)); } - flowWidget->addWidget(new DeckPreviewTagAdditionWidget(this, tr("Add tags ..."))); + flowWidget->addWidget(new DeckPreviewTagAdditionWidget(this, tr("Edit tags ..."))); layout->addWidget(flowWidget); } \ No newline at end of file diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp index 47437892e..399834c12 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp @@ -19,15 +19,15 @@ DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(DeckPreviewDeckTagsDi layout->addWidget(tagLabel_); // Create close button - closeButton_ = new QPushButton("x", this); - closeButton_->setFixedSize(16, 16); // Small square button - layout->addWidget(closeButton_); + // closeButton_ = new QPushButton("x", this); + // closeButton_->setFixedSize(16, 16); // Small square button + // layout->addWidget(closeButton_); // Adjust widget size setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); // Connect close button to the remove signal - connect(closeButton_, &QPushButton::clicked, this, &DeckPreviewTagAdditionWidget::tagClosed); + // connect(closeButton_, &QPushButton::clicked, this, &DeckPreviewTagAdditionWidget::tagClosed); } void DeckPreviewTagAdditionWidget::mousePressEvent(QMouseEvent *event) diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp index d87bc43b3..90ef5879f 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp @@ -14,25 +14,25 @@ DeckPreviewTagDisplayWidget::DeckPreviewTagDisplayWidget(QWidget *parent, const layout->setSpacing(5); // Add a stretch spacer for text and close button separation - layout->addStretch(); // Ensures the close button stays at the far-right side + // layout->addStretch(); // Ensures the close button stays at the far-right side // Create close button - closeButton = new QPushButton("x", this); - closeButton->setFixedSize(16, 16); // Small square button - closeButton->setFocusPolicy(Qt::NoFocus); + // closeButton = new QPushButton("x", this); + // closeButton->setFixedSize(16, 16); // Small square button + // closeButton->setFocusPolicy(Qt::NoFocus); // Set font for close button to ensure the "x" appears correctly - QFont closeButtonFont = closeButton->font(); - closeButtonFont.setPointSize(10); // Adjust the size to make the "x" clear - closeButton->setFont(closeButtonFont); + // QFont closeButtonFont = closeButton->font(); + // closeButtonFont.setPointSize(10); // Adjust the size to make the "x" clear + // closeButton->setFont(closeButtonFont); - layout->addWidget(closeButton); + // layout->addWidget(closeButton); // Adjust widget size setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); // Connect close button to the remove signal - connect(closeButton, &QPushButton::clicked, this, &DeckPreviewTagDisplayWidget::tagClosed); + // connect(closeButton, &QPushButton::clicked, this, &DeckPreviewTagDisplayWidget::tagClosed); } QSize DeckPreviewTagDisplayWidget::sizeHint() const @@ -40,7 +40,7 @@ QSize DeckPreviewTagDisplayWidget::sizeHint() const // Calculate the size based on the tag name and close button QFontMetrics fm(font()); int textWidth = fm.horizontalAdvance(tagName); - int width = textWidth + closeButton->width() + 50; // Add extra padding + int width = textWidth + 50; // Add extra padding int height = fm.height() + 10; // Height based on font size + padding return QSize(width, height); @@ -86,9 +86,9 @@ void DeckPreviewTagDisplayWidget::paintEvent(QPaintEvent *event) painter.setFont(font); // Calculate text rect to avoid overlap with the close button - int closeButtonWidth = closeButton->width(); + // int closeButtonWidth = closeButton->width(); int margin = 10; // Left and right margins - QRect textRect(margin, 0, width() - closeButtonWidth - margin * 2, height()); + QRect textRect(margin, 0, width() - margin * 2, height()); // Draw the text with a black border for better legibility painter.setPen(Qt::black);