diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp index 85d210e1a..7206c05c9 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp @@ -47,7 +47,7 @@ CardInfoPictureWidget::CardInfoPictureWidget(QWidget *parent, const bool _hoverT originalPos = this->pos(); // Create the animation - animation = new QPropertyAnimation(this, "pos"); + animation = new QPropertyAnimation(this, "pos", this); animation->setDuration(200); // 200ms animation duration animation->setEasingCurve(QEasingCurve::OutQuad); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 4c782c989..f98e37e16 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -92,7 +92,7 @@ void DeckPreviewWidget::initializeUi(const bool deckLoadSuccess) bannerCardComboBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); bannerCardComboBox->setObjectName("bannerCardComboBox"); bannerCardComboBox->setCurrentText(deckLoader->getDeck().deckList.getBannerCard().name); - bannerCardComboBox->installEventFilter(new NoScrollFilter()); + bannerCardComboBox->installEventFilter(new NoScrollFilter(bannerCardComboBox)); connect(bannerCardComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &DeckPreviewWidget::setBannerCard); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h index e5975db71..85f0ce76e 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h @@ -82,6 +82,11 @@ private slots: class NoScrollFilter : public QObject { Q_OBJECT +public: + explicit NoScrollFilter(QObject *parent = nullptr) : QObject(parent) + { + } + protected: bool eventFilter(QObject *obj, QEvent *event) override {