Skip to content

fix: adjust switchbutton dci icon #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Whale107 merged 1 commit into from
Sep 6, 2024
Merged

fix: adjust switchbutton dci icon #603

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
Binary file modified src/widgets/assets/icons/bloom/switch_off.dci
View file
Open in desktop
Binary file not shown.
Binary file modified src/widgets/assets/icons/bloom/switch_on.dci
View file
Open in desktop
Binary file not shown.
14 changes: 1 addition & 13 deletions src/widgets/dswitchbutton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@
#include <DGuiApplicationHelper>

#include <QApplication>
#include <QTimer>

DWIDGET_BEGIN_NAMESPACE

constexpr int DCI_ICON_SIZE = 120;
constexpr int TIMER_INTERVAL = 200;

/*!
@~english
Expand Down Expand Up @@ -63,7 +61,7 @@ void DSwitchButton::paintEvent(QPaintEvent *e)
painter.drawControl(DStyle::CE_SwitchButton, opt);

painter.setRenderHint(QPainter::SmoothPixmapTransform);
painter.drawImage(rect().adjusted(2, -10, -2, 8), d->player.currentImage()); // 为了显示按钮的阴影所留的空白
painter.drawImage(rect().adjusted(4, -8, -4, 8), d->player.currentImage()); // 为了显示按钮的阴影所留的空白
}

/*!
Expand Down Expand Up @@ -98,7 +96,6 @@ void DSwitchButton::initStyleOption(DStyleOptionButton *option) const

DSwitchButtonPrivate::DSwitchButtonPrivate(DSwitchButton *qq)
: DObjectPrivate(qq)
, timer(new QTimer(qq))
{

}
Expand All @@ -113,7 +110,6 @@ void DSwitchButtonPrivate::init()
checked = false;
animationStartValue = 0;
animationEndValue = 1;
timer->setInterval(TIMER_INTERVAL);

D_Q(DSwitchButton);

Expand Down Expand Up @@ -143,7 +139,6 @@ void DSwitchButtonPrivate::init()
DDciIcon icon = checked ? DDciIcon::fromTheme("switch_on") : DDciIcon::fromTheme("switch_off");
player.setIcon(icon);
player.play(DDciIcon::Mode::Normal);
timer->start();

Q_EMIT q->checkedChanged(checked);
});
Expand All @@ -152,13 +147,6 @@ void DSwitchButtonPrivate::init()
q->update();
});

q->connect(timer, &QTimer::timeout, q, [q, this]() {
player.stop();
player.setIcon(!q->isChecked() ? DDciIcon::fromTheme("switch_on") : DDciIcon::fromTheme("switch_off"));
player.setMode(DDciIcon::Normal);
timer->stop();
});

q->connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, q, initPlayer);
}

Expand Down
1 change: 0 additions & 1 deletion src/widgets/private/dswitchbutton_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class DSwitchButtonPrivate : public DTK_CORE_NAMESPACE::DObjectPrivate
double animationEndValue = 0.0;

DDciIconPlayer player;
QTimer *timer;

public:
D_DECLARE_PUBLIC(DSwitchButton)
Expand Down