Skip to content

Commit

Permalink
WStarRating: Distinguish between actual and visual star count
Browse files Browse the repository at this point in the history
  • Loading branch information
@uklotzde @ronso0
uklotzde authored and ronso0 committed May 20, 2023
1 parent 9516d6f commit c43e6a3
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 39 deletions.
76 changes: 43 additions & 33 deletions src/widget/wstarrating.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

WStarRating::WStarRating(const QString& group, QWidget* pParent)
: WWidget(pParent),
m_starRating(0, 5),
m_currRating(0) {
m_starCount(0),
m_visualStarRating(m_starCount, 5) {
// Controls to change the star rating with controllers.
// Note that 'group' maybe NULLPTR, e.g. when called from DlgTrackInfo,
// so only create rate change COs if there's a group passed when creating deck widgets.
Expand All @@ -36,23 +36,27 @@ void WStarRating::setup(const QDomNode& node, const SkinContext& context) {
QSize WStarRating::sizeHint() const {
QStyleOption option;
option.initFrom(this);
QSize widgetSize = style()->sizeFromContents(QStyle::CT_PushButton, &option,
m_starRating.sizeHint(), this);
QSize widgetSize = style()->sizeFromContents(QStyle::CT_PushButton,
&option,
m_visualStarRating.sizeHint(),
this);

m_contentRect.setRect(
(widgetSize.width() - m_starRating.sizeHint().width()) / 2,
(widgetSize.height() - m_starRating.sizeHint().height()) / 2,
m_starRating.sizeHint().width(),
m_starRating.sizeHint().height()
);
(widgetSize.width() - m_visualStarRating.sizeHint().width()) / 2,
(widgetSize.height() - m_visualStarRating.sizeHint().height()) / 2,
m_visualStarRating.sizeHint().width(),
m_visualStarRating.sizeHint().height());

return widgetSize;
}

void WStarRating::slotSetRating(int rating) {
m_starRating.setStarCount(rating);
m_currRating = rating;
update();
void WStarRating::slotSetRating(int starCount) {
if (starCount == m_starCount) {
// Unchanged
return;
}
m_starCount = starCount;
updateVisualRating(starCount);
}

void WStarRating::paintEvent(QPaintEvent * /*unused*/) {
Expand All @@ -63,7 +67,7 @@ void WStarRating::paintEvent(QPaintEvent * /*unused*/) {
painter.setBrush(option.palette.text());
painter.drawPrimitive(QStyle::PE_Widget, option);

m_starRating.paint(&painter, m_contentRect);
m_visualStarRating.paint(&painter, m_contentRect);
}

void WStarRating::mouseMoveEvent(QMouseEvent *event) {
Expand All @@ -73,58 +77,64 @@ void WStarRating::mouseMoveEvent(QMouseEvent *event) {
int star = starAtPosition(event->x());
#endif

if (star != m_starRating.starCount() && star != -1) {
m_starRating.setStarCount(star);
update();
if (star != -1) {
updateVisualRating(star);
}
}

void WStarRating::slotStarsUp(double v) {
if (v > 0 && m_currRating < m_starRating.maxStarCount()) {
int star = m_currRating + 1;
emit ratingChanged(star);
if (v > 0 && m_starCount < m_visualStarRating.maxStarCount()) {
slotSetRating(m_starCount + 1);
}
}

void WStarRating::slotStarsDown(double v) {
if (v > 0 && m_currRating > 0) {
int star = m_currRating - 1;
emit ratingChanged(star);
if (v > 0 && m_starCount > StarRating::kMinStarCount) {
slotSetRating(m_starCount - 1);
}
}

void WStarRating::leaveEvent(QEvent* /*unused*/) {
// reset to applied track rating
m_starRating.setStarCount(m_currRating);
resetVisualRating();
}

void WStarRating::updateVisualRating(int starCount) {
if (starCount == m_visualStarRating.starCount()) {
return;
}
m_visualStarRating.setStarCount(starCount);
update();
}

// The method uses basic linear algebra to find out which star is under the cursor.
int WStarRating::starAtPosition(int x) {
int WStarRating::starAtPosition(int x) const {
// If the mouse is very close to the left edge, set 0 stars.
if (x < m_starRating.sizeHint().width() * 0.05) {
if (x < m_visualStarRating.sizeHint().width() * 0.05) {
return 0;
}
int star = (x / (m_starRating.sizeHint().width() / m_starRating.maxStarCount())) + 1;
int star = (x /
(m_visualStarRating.sizeHint().width() /
m_visualStarRating.maxStarCount())) +
1;

if (star <= 0 || star > m_starRating.maxStarCount()) {
if (star <= 0 || star > m_visualStarRating.maxStarCount()) {
return 0;
}

return star;
}

void WStarRating::mouseReleaseEvent(QMouseEvent* /*unused*/) {
emit ratingChanged(m_starRating.starCount());
int starCount = m_visualStarRating.starCount();
emit ratingChanged(starCount);
}

void WStarRating::fillDebugTooltip(QStringList* debug) {
WWidget::fillDebugTooltip(debug);

QString currentRating;
currentRating.setNum(m_currRating);
QString maximumRating = QString::number(m_starRating.maxStarCount());

currentRating.setNum(m_starCount);
QString maximumRating = QString::number(m_visualStarRating.maxStarCount());

*debug << QString("Rating: %1/%2").arg(currentRating, maximumRating);
}
17 changes: 11 additions & 6 deletions src/widget/wstarrating.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ class WStarRating : public WWidget {
QSize sizeHint() const override;

public slots:
void slotSetRating(int rating);
void slotSetRating(int starCount);

signals:
void ratingChanged(int rating);
void ratingChanged(int starCount);

private slots:
void slotStarsUp(double v);
Expand All @@ -40,12 +40,17 @@ class WStarRating : public WWidget {
void fillDebugTooltip(QStringList* debug) override;

private:
StarRating m_starRating;
int m_starCount;

StarRating m_visualStarRating;
mutable QRect m_contentRect;

int starAtPosition(int x);
int starAtPosition(int x) const;
void updateVisualRating(int starCount);
void resetVisualRating() {
updateVisualRating(m_starCount);
}

std::unique_ptr<ControlPushButton> m_pStarsUp;
std::unique_ptr<ControlPushButton> m_pStarsDown;

int m_currRating;
};

0 comments on commit c43e6a3

Please sign in to comment.