From c35bee0c65470b41f82a58b4ccecf5a8b4fa11bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E6=9C=8B=E7=A8=8B?= Date: Thu, 1 Dec 2022 17:12:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9F=B3=E9=87=8F?= =?UTF-8?q?=E8=B0=83=E8=8A=82=E6=8E=A7=E4=BB=B6=E5=B9=85=E5=BA=A6=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 音量调节幅度为2%，这里的控件上次修改时漏掉了 亮度调节也有类似的问题，一并修复 Log: 修复音量调节控件幅度不正确的问题 Influence: 音量控件调节幅度 Bug: https://pms.uniontech.com/bug-view-172417.html Change-Id: I945698a16b8ad19dee8d22e71cc639ca68204946 --- plugins/display/brightnessadjwidget.cpp | 4 +++- plugins/sound/sounddeviceswidget.cpp | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/display/brightnessadjwidget.cpp b/plugins/display/brightnessadjwidget.cpp index 1b339a977..19b10e82c 100644 --- a/plugins/display/brightnessadjwidget.cpp +++ b/plugins/display/brightnessadjwidget.cpp @@ -52,7 +52,9 @@ void BrightnessAdjWidget::loadBrightnessItem() QPixmap rightPixmap = ImageUtil::loadSvg(":/icons/resources/brightnesshigh", QSize(20, 20)); sliderContainer->setIcon(SliderContainer::IconPosition::LeftIcon,leftPixmap, QSize(), 12); sliderContainer->setIcon(SliderContainer::IconPosition::RightIcon, rightPixmap, QSize(), 12); - + // 需求要求调节范围是10%-100%,且调节幅度为1% + sliderContainer->setRange(10, 100); + sliderContainer->setPageStep(1); sliderContainer->setFixedWidth(310); sliderContainer->setFixedHeight(itemHeight); sliderContainer->updateSliderValue(monitor->brightness()); diff --git a/plugins/sound/sounddeviceswidget.cpp b/plugins/sound/sounddeviceswidget.cpp index 9fcfa7264..d2c9ba3e6 100644 --- a/plugins/sound/sounddeviceswidget.cpp +++ b/plugins/sound/sounddeviceswidget.cpp @@ -112,6 +112,8 @@ void SoundDevicesWidget::initUi() SliderProxyStyle *proxy = new SliderProxyStyle(SliderProxyStyle::Normal); m_sliderContainer->setSliderProxyStyle(proxy); + m_sliderContainer->setRange(0, std::round(m_soundInter->maxUIVolume() * 100.00)); + m_sliderContainer->setPageStep(2); sliderLayout->addWidget(m_sliderContainer); QHBoxLayout *topLayout = new QHBoxLayout(this); @@ -212,7 +214,9 @@ void SoundDevicesWidget::initConnection() connect(m_delegate, &SettingDelegate::selectIndexChanged, this, &SoundDevicesWidget::onSelectIndexChanged); connect(m_soundInter, &DBusAudio::PortEnabledChanged, this, &SoundDevicesWidget::onAudioDevicesChanged); connect(m_soundInter, &DBusAudio::CardsWithoutUnavailableChanged, this, &SoundDevicesWidget::onAudioDevicesChanged); - + connect(m_soundInter, &DBusAudio::MaxUIVolumeChanged, this, [ = ] (double maxValue) { + m_sliderContainer->setRange(0, std::round(maxValue * 100.00)); + }); connect(m_sliderContainer, &SliderContainer::sliderValueChanged, this, [ this ](int value) { m_sinkInter->SetVolume(value * 0.01, true); });