Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Fix members overwriting #6

Merged
Skycoder42 merged 1 commit into from
Oct 11, 2020
Merged

Fix members overwriting #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions qtaskbarcontrol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ void QTaskbarControl::setWindowsBadgeTextColor(const QColor &color)
d->setWindowsBadgeTextColor(color);
}

void QTaskbarControl::setProgressVisible(bool progressVisible)
void QTaskbarControl::setProgressVisible(bool visible)
{
if (d->progressVisible == progressVisible)
if (d->progressVisible == visible)
return;

d->progressVisible = progressVisible;
d->setProgress(progressVisible, d->progress);
emit progressVisibleChanged(progressVisible);
d->progressVisible = visible;
d->setProgress(visible, d->progress);
emit progressVisibleChanged(visible);
}

void QTaskbarControl::setProgress(double progress)
Expand All @@ -104,24 +104,24 @@ void QTaskbarControl::setProgress(double progress)
emit progressChanged(progress);
}

void QTaskbarControl::setCounterVisible(bool counterVisible)
void QTaskbarControl::setCounterVisible(bool visible)
{
if (d->counterVisible == counterVisible)
if (d->counterVisible == visible)
return;

d->counterVisible = counterVisible;
d->setCounter(counterVisible, d->counter);
emit counterVisibleChanged(counterVisible);
d->counterVisible = visible;
d->setCounter(visible, d->counter);
emit counterVisibleChanged(visible);
}

void QTaskbarControl::setCounter(int counter)
void QTaskbarControl::setCounter(int value)
{
if (d->counter == counter)
if (d->counter == value)
return;

d->counter = counter;
d->setCounter(d->counterVisible, counter);
emit counterChanged(counter);
d->counter = value;
d->setCounter(d->counterVisible, value);
emit counterChanged(value);
}

bool QTaskbarControl::eventFilter(QObject *watched, QEvent *event)
Expand Down
12 changes: 6 additions & 6 deletions qtaskbarcontrol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ public slots:
void setWindowsProgressState(WinProgressState state);
void setWindowsBadgeIcon(const QIcon &icon);
void setWindowsBadgeTextColor(const QColor &color);
void setProgressVisible(bool progressVisible);
void setProgressVisible(bool visible);
void setProgress(double progress);
void setCounterVisible(bool counterVisible);
void setCounter(int counter);
void setCounterVisible(bool visible);
void setCounter(int value);

signals:
void progressVisibleChanged(bool progressVisible);
void progressVisibleChanged(bool visible);
void progressChanged(double progress);
void counterVisibleChanged(bool counterVisible);
void counterChanged(int counter);
void counterVisibleChanged(bool visible);
void counterChanged(int value);

private:
QScopedPointer<QTaskbarControlPrivate> d;
Expand Down
10 changes: 5 additions & 5 deletions qtaskbarcontrol_dummy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ QTaskbarControlPrivate *QTaskbarControlPrivate::createPrivate(QTaskbarControl *)
return new QDummyTaskbarControl{};
}

void QDummyTaskbarControl::setProgress(bool progressVisible, double progress)
void QDummyTaskbarControl::setProgress(bool visible, double progress)
{
Q_UNUSED(progressVisible)
Q_UNUSED(visible)
Q_UNUSED(progress)
}

void QDummyTaskbarControl::setCounter(bool counterVisible, int counter)
void QDummyTaskbarControl::setCounter(bool visible, int value)
{
Q_UNUSED(counterVisible)
Q_UNUSED(counter)
Q_UNUSED(visible)
Q_UNUSED(value)
}
4 changes: 2 additions & 2 deletions qtaskbarcontrol_dummy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ class QDummyTaskbarControl : public QTaskbarControlPrivate
{
public:
// QTaskbarControlPrivate interface
void setProgress(bool progressVisible, double progress) override;
void setCounter(bool counterVisible, int counter) override;
void setProgress(bool visible, double progress) override;
void setCounter(bool visible, int value) override;
};

#endif // QTASKBARCONTROL_DUMMY_H
4 changes: 2 additions & 2 deletions qtaskbarcontrol_mac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ class QMacTaskbarControl : public QTaskbarControlPrivate
QMacTaskbarControl();
~QMacTaskbarControl();

void setProgress(bool progressVisible, double progress) override;
void setCounter(bool counterVisible, int counter) override;
void setProgress(bool visible, double progress) override;
void setCounter(bool visible, int value) override;

private:
TaskProgressView *_taskView;
Expand Down
10 changes: 5 additions & 5 deletions qtaskbarcontrol_mac.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,20 @@ - (void)drawRect:(NSRect)rect
[_taskView release];
}

void QMacTaskbarControl::setProgress(bool progressVisible, double progress)
void QMacTaskbarControl::setProgress(bool visible, double progress)
{
[_taskView setProgress:progress];
if (progressVisible && progress >= 0.0)
if (visible && progress >= 0.0)
[[NSApp dockTile] setContentView:_taskView];
else
[[NSApp dockTile] setContentView:nil];
[[NSApp dockTile] display];
}

void QMacTaskbarControl::setCounter(bool counterVisible, int counter)
void QMacTaskbarControl::setCounter(bool visible, int value)
{
if(counterVisible)
QtMac::setBadgeLabelText(QLocale().toString(counter));
if(visible)
QtMac::setBadgeLabelText(QLocale().toString(value));
else
QtMac::setBadgeLabelText(QString());
}
4 changes: 2 additions & 2 deletions qtaskbarcontrol_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class QTaskbarControlPrivate
virtual QIcon windowsBadgeIcon() const;
virtual void setWindowsBadgeTextColor(const QColor &color);
virtual QColor windowsBadgeTextColor() const;
virtual void setProgress(bool progressVisible, double progress) = 0;
virtual void setCounter(bool counterVisible, int counter) = 0;
virtual void setProgress(bool visible, double progress) = 0;
virtual void setCounter(bool visible, int value) = 0;

private:
QPointer<QWidget> watchedWidget;
Expand Down
10 changes: 5 additions & 5 deletions qtaskbarcontrol_win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,22 @@ QColor QWinTaskbarControl::windowsBadgeTextColor() const
return _badgeColor;
}

void QWinTaskbarControl::setProgress(bool progressVisible, double progress)
void QWinTaskbarControl::setProgress(bool visible, double progress)
{
if(progress < 0)
_button->progress()->setRange(0, 0);
else {
_button->progress()->setRange(0, 1000);
_button->progress()->setValue(static_cast<int>(progress * 1000));
}
_button->progress()->setVisible(progressVisible);
_button->progress()->setVisible(visible);
}

void QWinTaskbarControl::setCounter(bool counterVisible, int counter)
void QWinTaskbarControl::setCounter(bool visible, int visible)
{
if(counterVisible) {
if(visible) {
QIcon currentBadge;
auto text = QLocale{}.toString(counter);
auto text = QLocale{}.toString(visible);

foreach(auto size, _badgeIcon.availableSizes()) {
auto pm = _badgeIcon.pixmap(size);
Expand Down
4 changes: 2 additions & 2 deletions qtaskbarcontrol_win.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class QWinTaskbarControl : public QTaskbarControlPrivate
QIcon windowsBadgeIcon() const override;
void setWindowsBadgeTextColor(const QColor &color) override;
QColor windowsBadgeTextColor() const override;
void setProgress(bool progressVisible, double progress) override;
void setCounter(bool counterVisible, int counter) override;
void setProgress(bool visible, double progress) override;
void setCounter(bool visible, int counter) override;

private:
QTaskbarControl *_q_ptr;
Expand Down
10 changes: 5 additions & 5 deletions qtaskbarcontrol_x11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ QTaskbarControlPrivate *QTaskbarControlPrivate::createPrivate(QTaskbarControl *)
return new QX11TaskbarControl{};
}

void QX11TaskbarControl::setProgress(bool progressVisible, double progress)
void QX11TaskbarControl::setProgress(bool visible, double progress)
{
QVariantMap properties;
properties.insert(QStringLiteral("progress-visible"), progressVisible);
properties.insert(QStringLiteral("progress-visible"), visible);
properties.insert(QStringLiteral("progress"), progress);
sendMessage(properties);
}

void QX11TaskbarControl::setCounter(bool counterVisible, int counter)
void QX11TaskbarControl::setCounter(bool visible, int value)
{
QVariantMap properties;
properties.insert(QStringLiteral("count-visible"), counterVisible);
properties.insert(QStringLiteral("count"), counter);
properties.insert(QStringLiteral("count-visible"), visible);
properties.insert(QStringLiteral("count"), value);
sendMessage(properties);
}

Expand Down
4 changes: 2 additions & 2 deletions qtaskbarcontrol_x11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ class QX11TaskbarControl : public QTaskbarControlPrivate
{
public:
// QTaskbarControlPrivate interface
void setProgress(bool progressVisible, double progress) override;
void setCounter(bool counterVisible, int counter) override;
void setProgress(bool visible, double progress) override;
void setCounter(bool visible, int value) override;

private:
void sendMessage(const QVariantMap &params);
Expand Down