Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions qtaskbarcontrol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ void QTaskbarControl::setProgressVisible(bool visible)
emit progressVisibleChanged(visible);
}

void QTaskbarControl::setProgress(double progress)
void QTaskbarControl::setProgress(double value)
{
if (qFuzzyCompare(d->progress, progress))
if (qFuzzyCompare(d->progress, value))
return;

d->progress = progress;
d->setProgress(d->progressVisible, progress);
emit progressChanged(progress);
d->progress = value;
d->setProgress(d->progressVisible, value);
emit progressChanged(value);
}

void QTaskbarControl::setCounterVisible(bool visible)
Expand Down
4 changes: 2 additions & 2 deletions qtaskbarcontrol.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ public slots:
void setWindowsBadgeIcon(const QIcon &icon);
void setWindowsBadgeTextColor(const QColor &color);
void setProgressVisible(bool visible);
void setProgress(double progress);
void setProgress(double value);
void setCounterVisible(bool visible);
void setCounter(int value);

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

Expand Down
4 changes: 2 additions & 2 deletions qtaskbarcontrol_dummy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ QTaskbarControlPrivate *QTaskbarControlPrivate::createPrivate(QTaskbarControl *)
return new QDummyTaskbarControl{};
}

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

void QDummyTaskbarControl::setCounter(bool visible, int value)
Expand Down
2 changes: 1 addition & 1 deletion qtaskbarcontrol_dummy.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class QDummyTaskbarControl : public QTaskbarControlPrivate
{
public:
// QTaskbarControlPrivate interface
void setProgress(bool visible, double progress) override;
void setProgress(bool visible, double value) override;
void setCounter(bool visible, int value) override;
};

Expand Down
4 changes: 2 additions & 2 deletions qtaskbarcontrol_mac.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
double _progress;
}

- (void)setProgress:(double)progress;
- (void)setProgress:(double)value;

@end

Expand All @@ -19,7 +19,7 @@ class QMacTaskbarControl : public QTaskbarControlPrivate
QMacTaskbarControl();
~QMacTaskbarControl();

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

private:
Expand Down
10 changes: 5 additions & 5 deletions qtaskbarcontrol_mac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

@implementation TaskProgressView

- (void)setProgress:(double)progress
- (void)setProgress:(double)value
{
_progress = progress;
_progress = value;
}

- (void)drawRect:(NSRect)rect
Expand Down Expand Up @@ -73,10 +73,10 @@ - (void)drawRect:(NSRect)rect
[_taskView release];
}

void QMacTaskbarControl::setProgress(bool visible, double progress)
void QMacTaskbarControl::setProgress(bool visible, double value)
{
[_taskView setProgress:progress];
if (visible && progress >= 0.0)
[_taskView setProgress:value];
if (visible && value >= 0.0)
[[NSApp dockTile] setContentView:_taskView];
else
[[NSApp dockTile] setContentView:nil];
Expand Down
2 changes: 1 addition & 1 deletion qtaskbarcontrol_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class QTaskbarControlPrivate
virtual QIcon windowsBadgeIcon() const;
virtual void setWindowsBadgeTextColor(const QColor &color);
virtual QColor windowsBadgeTextColor() const;
virtual void setProgress(bool visible, double progress) = 0;
virtual void setProgress(bool visible, double value) = 0;
virtual void setCounter(bool visible, int value) = 0;

private:
Expand Down
10 changes: 5 additions & 5 deletions qtaskbarcontrol_win.cpp
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 visible, double progress)
void QWinTaskbarControl::setProgress(bool visible, double value)
{
if(progress < 0)
if(value < 0)
_button->progress()->setRange(0, 0);
else {
_button->progress()->setRange(0, 1000);
_button->progress()->setValue(static_cast<int>(progress * 1000));
_button->progress()->setValue(static_cast<int>(value * 1000));
}
_button->progress()->setVisible(visible);
}

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

foreach(auto size, _badgeIcon.availableSizes()) {
auto pm = _badgeIcon.pixmap(size);
Expand Down
4 changes: 2 additions & 2 deletions qtaskbarcontrol_win.h
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 visible, double progress) override;
void setCounter(bool visible, int counter) override;
void setProgress(bool visible, double value) override;
void setCounter(bool visible, int value) override;

private:
QTaskbarControl *_q_ptr;
Expand Down
4 changes: 2 additions & 2 deletions qtaskbarcontrol_x11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ QTaskbarControlPrivate *QTaskbarControlPrivate::createPrivate(QTaskbarControl *)
return new QX11TaskbarControl{};
}

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

Expand Down
2 changes: 1 addition & 1 deletion qtaskbarcontrol_x11.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class QX11TaskbarControl : public QTaskbarControlPrivate
{
public:
// QTaskbarControlPrivate interface
void setProgress(bool visible, double progress) override;
void setProgress(bool visible, double value) override;
void setCounter(bool visible, int value) override;

private:
Expand Down