diff --git a/cockatrice/src/client/ui/pixel_map_generator.cpp b/cockatrice/src/client/ui/pixel_map_generator.cpp index c39177117..e608f4949 100644 --- a/cockatrice/src/client/ui/pixel_map_generator.cpp +++ b/cockatrice/src/client/ui/pixel_map_generator.cpp @@ -357,7 +357,7 @@ QPixmap LockPixmapGenerator::generatePixmap(int height) QMap LockPixmapGenerator::pmCache; -QPixmap ExpandIconPixmapGenerator::generatePixmap(int height, bool expanded) +QPixmap DropdownIconPixmapGenerator::generatePixmap(int height, bool expanded) { QString key = QString::number(expanded) + ":" + QString::number(height); if (pmCache.contains(key)) @@ -370,7 +370,7 @@ QPixmap ExpandIconPixmapGenerator::generatePixmap(int height, bool expanded) return pixmap; } -QMap ExpandIconPixmapGenerator::pmCache; +QMap DropdownIconPixmapGenerator::pmCache; QPixmap loadColorAdjustedPixmap(const QString &name) { diff --git a/cockatrice/src/client/ui/pixel_map_generator.h b/cockatrice/src/client/ui/pixel_map_generator.h index da705ef2f..0380de5ee 100644 --- a/cockatrice/src/client/ui/pixel_map_generator.h +++ b/cockatrice/src/client/ui/pixel_map_generator.h @@ -106,7 +106,7 @@ public: } }; -class ExpandIconPixmapGenerator +class DropdownIconPixmapGenerator { private: static QMap pmCache; diff --git a/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp b/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp index d36d93b8e..abed4bac5 100644 --- a/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp +++ b/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp @@ -46,23 +46,23 @@ void BannerWidget::setText(const QString &text) const void BannerWidget::setClickable(bool _clickable) { clickable = _clickable; - setExpandIconState(true); + setDropdownIconState(true); } void BannerWidget::toggleBuddyVisibility() const { if (buddy) { buddy->setVisible(!buddy->isVisible()); - setExpandIconState(buddy->isVisible()); + setDropdownIconState(buddy->isVisible()); } else { - setExpandIconState(false); + setDropdownIconState(false); } } -void BannerWidget::setExpandIconState(bool expanded) const +void BannerWidget::setDropdownIconState(bool expanded) const { if (clickable) { - iconLabel->setPixmap(ExpandIconPixmapGenerator::generatePixmap(24, expanded)); + iconLabel->setPixmap(DropdownIconPixmapGenerator::generatePixmap(24, expanded)); } else { // we cannot directly hide the iconLabel, since it's needed to center the text; set an empty image instead iconLabel->setPixmap(QPixmap()); diff --git a/cockatrice/src/client/ui/widgets/general/display/banner_widget.h b/cockatrice/src/client/ui/widgets/general/display/banner_widget.h index e9ac0c78d..552e5ea98 100644 --- a/cockatrice/src/client/ui/widgets/general/display/banner_widget.h +++ b/cockatrice/src/client/ui/widgets/general/display/banner_widget.h @@ -40,7 +40,7 @@ signals: void buddyVisibilityChanged(); private slots: void toggleBuddyVisibility() const; - void setExpandIconState(bool expanded) const; + void setDropdownIconState(bool expanded) const; }; #endif // BANNER_WIDGET_H