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

Merge tag '5.1.0.9' into uos

Browse Source
This commit is contained in:
范朋程 2020-06-05 15:26:46 +08:00
commit e7dacb6723
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.project Normal file
View File

@ -0,0 +1,6 @@
{
"type": "homebrew" | "opensource",
"3rdparty: ["*.xml"],
"ignore": ["CHANGELOG.md", "./debian", "README.md", "./cmake", "technology-overview.md", "CMakeLists.txt", "CMakeLists.txt.user", "./plugins/plugin-guide", "./.tx", "*.qrc", "*.svg", "*.png", "*.qm", "*.ts"],
"license": ["LICENSE"]
}

9
plugins/sound/soundapplet.cpp
View File

@ -111,7 +111,7 @@ SoundApplet::SoundApplet(QWidget *parent)
m_volumeBtn->setFixedSize(ICON_SIZE, ICON_SIZE);
m_volumeSlider->setMinimum(0);
m_volumeSlider->setMaximum(m_audioInter->maxUIVolume() * 1000.0f);
m_volumeSlider->setMaximum(m_audioInter->maxUIVolume() * 100.0f);
m_centralLayout = new QVBoxLayout;
m_centralLayout->addLayout(deviceLineLayout);
@ -174,7 +174,7 @@ void SoundApplet::onVolumeChanged()
{
const float volume = m_defSinkInter->volume();
m_volumeSlider->setValue(std::min(1500.0f, volume * 1000.0f));
m_volumeSlider->setValue(std::min(150.0f, volume * 100.0f));
m_soundShow->setText(QString::number(volume * 100) + '%');
emit volumeChanged(m_volumeSlider->value());
@ -183,8 +183,7 @@ void SoundApplet::onVolumeChanged()
void SoundApplet::volumeSliderValueChanged()
{
m_defSinkInter->SetVolumeQueued(m_volumeSlider->value() / 1000.0f, false);
m_soundShow->setText(QString("%1%").arg(m_volumeSlider->value() / 10));
m_defSinkInter->SetVolumeQueued(m_volumeSlider->value() / 100.0f, false);
}
void SoundApplet::sinkInputsChanged()
@ -224,7 +223,7 @@ void SoundApplet::onPlaySoundEffect()
void SoundApplet::increaseVolumeChanged()
{
m_volumeSlider->setMaximum(m_audioInter->maxUIVolume() * 1000.0f);
m_volumeSlider->setMaximum(m_audioInter->maxUIVolume() * 100.0f);
}
void SoundApplet::refreshIcon()