Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复音量插件界面部分图标显示模糊的问题

Browse Source 
音量的两个图标回执的方式不一样，目前是右侧的图标显示正常，所以都改成了右侧图标显示的方式

Log: 修复音量插件界面部分图标显示模糊的问题
Bug: https://pms.uniontech.com/zentao/bug-view-81685.html
Change-Id: I3513cb677f711ca0567134ca96e950672cb4eb9f
This commit is contained in:
FanPengCheng 2021-05-27 21:44:19 +08:00
parent 78eb30b41d
commit fbbc4c3aac
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/sound/sinkinputwidget.cpp
View File

@ -50,7 +50,7 @@ SinkInputWidget::SinkInputWidget(const QString &inputPath, QWidget *parent)
: QWidget(parent)
, m_inputInter(new DBusSinkInput("com.deepin.daemon.Audio",inputPath, QDBusConnection::sessionBus(), this))
, m_appBtn(new DIconButton(this))
, m_volumeBtnMin(new DIconButton(this))
, m_volumeIconMin(new QLabel(this))
, m_volumeIconMax(new QLabel(this))
, m_volumeSlider(new VolumeSlider(this))
, m_volumeLabel(new TipsWidget(this))
@ -65,12 +65,8 @@ SinkInputWidget::SinkInputWidget(const QString &inputPath, QWidget *parent)
titleLabel->setForegroundRole(DPalette::TextTitle);
titleLabel->setText(titleLabel->fontMetrics().elidedText(m_inputInter->name(), Qt::TextElideMode::ElideRight, APP_TITLE_SIZE));
m_volumeBtnMin->setAccessibleName("volume-button");
m_volumeBtnMin->setFixedSize(ICON_SIZE, ICON_SIZE);
m_volumeBtnMin->setIconSize(QSize(ICON_SIZE, ICON_SIZE));
m_volumeBtnMin->setIcon(DHiDPIHelper::loadNxPixmap("://audio-volume-low-symbolic.svg"));
m_volumeBtnMin->setFlat(true);
m_volumeIconMin->setAccessibleName("volume-button");
m_volumeIconMin->setFixedSize(ICON_SIZE, ICON_SIZE);
m_volumeIconMax->setFixedSize(ICON_SIZE, ICON_SIZE);
m_volumeSlider->setAccessibleName("app-" + iconName + "-slider");
@ -91,7 +87,7 @@ SinkInputWidget::SinkInputWidget(const QString &inputPath, QWidget *parent)
// 音量图标+slider
QHBoxLayout *volumeCtrlLayout = new QHBoxLayout;
volumeCtrlLayout->addSpacing(2);
volumeCtrlLayout->addWidget(m_volumeBtnMin);
volumeCtrlLayout->addWidget(m_volumeIconMin);
volumeCtrlLayout->addSpacing(10);
volumeCtrlLayout->addWidget(m_volumeSlider);
volumeCtrlLayout->addSpacing(10);
@ -108,8 +104,6 @@ SinkInputWidget::SinkInputWidget(const QString &inputPath, QWidget *parent)
connect(m_volumeSlider, &VolumeSlider::valueChanged, this, &SinkInputWidget::setVolume);
connect(m_volumeSlider, &VolumeSlider::valueChanged, this, &SinkInputWidget::onVolumeChanged);
// connect(m_volumeSlider, &VolumeSlider::requestPlaySoundEffect, this, &SinkInputWidget::onPlaySoundEffect);
connect(m_volumeBtnMin, &DIconButton::clicked, this, &SinkInputWidget::setMute);
connect(m_inputInter, &DBusSinkInput::MuteChanged, this, &SinkInputWidget::setMuteIcon);
connect(m_inputInter, &DBusSinkInput::VolumeChanged, this, [ = ] {
m_volumeSlider->setValue(m_inputInter->volume() * 1000);
@ -123,6 +117,7 @@ SinkInputWidget::SinkInputWidget(const QString &inputPath, QWidget *parent)
setLayout(centralLayout);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
setFixedHeight(60);
m_volumeIconMin->installEventFilter(this);
setMuteIcon();
refreshIcon();
@ -168,9 +163,9 @@ void SinkInputWidget::setMuteIcon()
p.drawPixmap(0, 0, muteIcon);
appIconSource.setDevicePixelRatio(ratio);
m_volumeBtnMin->setIcon(appIconSource);
m_volumeIconMin->setPixmap(appIconSource);
} else {
m_volumeBtnMin->setIcon(getIconFromTheme(m_inputInter->icon(), QSize(ICON_SIZE, ICON_SIZE), devicePixelRatioF()));
m_volumeIconMin->setPixmap(getIconFromTheme(m_inputInter->icon(), QSize(ICON_SIZE, ICON_SIZE), devicePixelRatioF()));
}
refreshIcon();
@ -200,7 +195,17 @@ void SinkInputWidget::refreshIcon()
m_volumeIconMax->setPixmap(ret);
ret = ImageUtil::loadSvg(iconLeft, ":/", ICON_SIZE, ratio);
m_volumeBtnMin->setIcon(ret);
m_volumeIconMin->setPixmap(ret);
}
bool SinkInputWidget::eventFilter(QObject *watcher, QEvent *event)
{
if (watcher == m_volumeIconMin) {
if (event->type() == QEvent::MouseButtonPress) {
setMute();
}
}
return false;
}
void SinkInputWidget:: onVolumeChanged()

5
plugins/sound/sinkinputwidget.h
View File

@ -53,11 +53,14 @@ private slots:
private:
void refreshIcon();
protected:
bool eventFilter(QObject* watcher, QEvent *event) override;
private:
DBusSinkInput *m_inputInter;
DIconButton *m_appBtn;
DIconButton *m_volumeBtnMin;
QLabel *m_volumeIconMin;
QLabel *m_volumeIconMax;
VolumeSlider *m_volumeSlider;
Dock::TipsWidget *m_volumeLabel;