mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-04 17:33:05 +00:00
fix: 调整字体后声音显示异常
调整字体后，显示列表需要重新计算视图高度，调整大小 Log: 修复调整字体后声音提示文字被遮挡问题 Bug: https://pms.uniontech.com/zentao/bug-view-47689.html Change-Id: Ifa80cee9d2768575f233926759cca34d0e0d35b5 Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/5299 Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com> Reviewed-by: <mailman@uniontech.com> Tested-by: <mailman@uniontech.com>
This commit is contained in:
xiechuan
parent
28a379c0a0
commit
45e631fdc9
@ -38,6 +38,7 @@
|
||||
#define ICON_SIZE 24
|
||||
#define ITEM_HEIGHT 24
|
||||
#define ITEM_SPACING 5
|
||||
#define DEVICE_SPACING 10
|
||||
|
||||
DWIDGET_USE_NAMESPACE
|
||||
DGUI_USE_NAMESPACE
|
||||
@ -107,11 +108,18 @@ SoundApplet::SoundApplet(QWidget *parent)
|
||||
, m_volumeIconMax(new QLabel)
|
||||
, m_volumeSlider(new VolumeSlider)
|
||||
, m_soundShow(new TipsWidget)
|
||||
, m_separator(new HorizontalSeparator)
|
||||
, m_audioInter(new DBusAudio("com.deepin.daemon.Audio", "/com/deepin/daemon/Audio", QDBusConnection::sessionBus(), this))
|
||||
, m_defSinkInter(nullptr)
|
||||
, m_listView(new DListView(this))
|
||||
, m_model(new QStandardItemModel(m_listView))
|
||||
, m_deviceInfo("")
|
||||
|
||||
{
|
||||
initUi();
|
||||
}
|
||||
|
||||
void SoundApplet::initUi()
|
||||
{
|
||||
m_listView->setEditTriggers(DListView::NoEditTriggers);
|
||||
m_listView->setSelectionMode(QAbstractItemView::NoSelection);
|
||||
@ -146,9 +154,9 @@ SoundApplet::SoundApplet(QWidget *parent)
|
||||
|
||||
QVBoxLayout *deviceLineLayout = new QVBoxLayout;
|
||||
deviceLineLayout->addLayout(deviceLayout);
|
||||
deviceLineLayout->addWidget(new HorizontalSeparator);
|
||||
deviceLineLayout->addWidget(m_separator);
|
||||
deviceLineLayout->setMargin(0);
|
||||
deviceLineLayout->setSpacing(10);
|
||||
deviceLineLayout->setSpacing(DEVICE_SPACING);
|
||||
|
||||
QHBoxLayout *volumeCtrlLayout = new QHBoxLayout;
|
||||
volumeCtrlLayout->addSpacing(2);
|
||||
@ -160,22 +168,6 @@ SoundApplet::SoundApplet(QWidget *parent)
|
||||
volumeCtrlLayout->setSpacing(0);
|
||||
volumeCtrlLayout->setMargin(0);
|
||||
|
||||
TipsWidget *appLabel = new TipsWidget;
|
||||
appLabel->setText(tr("Application"));
|
||||
|
||||
QVBoxLayout *appLineHLayout = new QVBoxLayout;
|
||||
appLineHLayout->addWidget(new HorizontalSeparator);
|
||||
appLineHLayout->addWidget(appLabel);
|
||||
appLineHLayout->setMargin(0);
|
||||
appLineHLayout->setSpacing(10);
|
||||
|
||||
QVBoxLayout *appLineVLayout = new QVBoxLayout;
|
||||
appLineVLayout->addSpacing(10);
|
||||
appLineVLayout->addLayout(appLineHLayout);
|
||||
appLineVLayout->addSpacing(8);
|
||||
appLineVLayout->setSpacing(0);
|
||||
appLineVLayout->setMargin(0);
|
||||
|
||||
m_volumeBtn->setFixedSize(ICON_SIZE, ICON_SIZE);
|
||||
m_volumeBtn->setIconSize(QSize(ICON_SIZE, ICON_SIZE));
|
||||
m_volumeBtn->setFlat(true);
|
||||
@ -186,6 +178,7 @@ SoundApplet::SoundApplet(QWidget *parent)
|
||||
m_centralLayout->addLayout(deviceLineLayout);
|
||||
m_centralLayout->addSpacing(8);
|
||||
m_centralLayout->addLayout(volumeCtrlLayout);
|
||||
m_centralLayout->setContentsMargins(8, 8, 8, 0);
|
||||
|
||||
m_listView->setModel(m_model);
|
||||
m_centralLayout->addWidget(m_listView);
|
||||
@ -202,6 +195,7 @@ SoundApplet::SoundApplet(QWidget *parent)
|
||||
m_centralWidget->setAutoFillBackground(false);
|
||||
viewport()->setAutoFillBackground(false);
|
||||
|
||||
connect(qApp, &QGuiApplication::fontChanged, this, &SoundApplet::updateListHeight);
|
||||
connect(m_volumeBtn, &DIconButton::clicked, this, &SoundApplet::toggleMute);
|
||||
connect(m_volumeSlider, &VolumeSlider::valueChanged, this, &SoundApplet::volumeSliderValueChanged);
|
||||
connect(m_volumeSlider, &VolumeSlider::requestPlaySoundEffect, this, &SoundApplet::onPlaySoundEffect);
|
||||
@ -351,20 +345,7 @@ void SoundApplet::cardsChanged(const QString &cards)
|
||||
}
|
||||
}
|
||||
|
||||
//设备数多于10个时显示滚动条,固定高度
|
||||
int count = m_model->rowCount();
|
||||
if (m_model->rowCount() > 10) {
|
||||
count = 10;
|
||||
m_listView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
|
||||
}
|
||||
else {
|
||||
m_listView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
}
|
||||
m_listView->setFixedHeight((count + 1) * (ITEM_HEIGHT + ITEM_SPACING));
|
||||
//2倍的ITEM_HEIGHT为设备音量空白区域和滑块所占高度大概值
|
||||
int height = m_volumeSlider->height() + m_soundShow->height() + (count + 2) * ITEM_HEIGHT + count * ITEM_SPACING;
|
||||
setFixedHeight(height);
|
||||
m_centralWidget->setFixedHeight(height);
|
||||
updateListHeight();
|
||||
}
|
||||
void SoundApplet::toggleMute()
|
||||
{
|
||||
@ -545,3 +526,34 @@ void SoundApplet::haldleDbusSignal(const QDBusMessage &msg)
|
||||
|
||||
getCradsInfo();
|
||||
}
|
||||
|
||||
void SoundApplet::updateListHeight()
|
||||
{
|
||||
//设备数多于10个时显示滚动条,固定高度
|
||||
int count = m_model->rowCount();
|
||||
if (m_model->rowCount() > 10) {
|
||||
count = 10;
|
||||
m_listView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
|
||||
} else {
|
||||
m_listView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
}
|
||||
|
||||
int visualHeight = 0;
|
||||
for (int i = 0; i < count; i++)
|
||||
visualHeight += m_listView->visualRect(m_model->index(i, 0)).height();
|
||||
|
||||
int listMargin = m_listView->contentsMargins().top() + m_listView->contentsMargins().bottom();
|
||||
//显示声音设备列表高度 = 设备的高度 + 间隔 + 边距
|
||||
int viewHeight = visualHeight + m_listView->spacing() * count * 2 + listMargin;
|
||||
// 设备信息高度 = 设备标签 + 分隔线 + 滚动条 + 间隔
|
||||
int infoHeight = m_soundShow->height() + m_separator->height() + m_volumeSlider->height() + m_centralLayout->spacing() * 3 + DEVICE_SPACING;
|
||||
int margain = m_centralLayout->contentsMargins().top() + m_centralLayout->contentsMargins().bottom();
|
||||
//整个界面高度 = 显示声音设备列表高度 + 设备信息高度 + 边距
|
||||
int totalHeight = viewHeight + infoHeight + margain;
|
||||
m_listView->setFixedHeight(viewHeight);
|
||||
setFixedHeight(totalHeight);
|
||||
m_centralWidget->setFixedHeight(totalHeight);
|
||||
update();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -40,6 +40,8 @@ DWIDGET_USE_NAMESPACE
|
||||
using DBusAudio = com::deepin::daemon::Audio;
|
||||
using DBusSink = com::deepin::daemon::audio::Sink;
|
||||
|
||||
class HorizontalSeparator;
|
||||
|
||||
namespace Dock{
|
||||
class TipsWidget;
|
||||
}
|
||||
@ -105,6 +107,7 @@ public:
|
||||
bool containsPort(const Port *port);
|
||||
Port *findPort(const QString &portId, const uint &cardId) const;
|
||||
void setUnchecked(DStandardItem *pi);
|
||||
void initUi();
|
||||
|
||||
signals:
|
||||
void volumeChanged(const int value) const;
|
||||
@ -123,6 +126,7 @@ private slots:
|
||||
void addPort(const Port *port);
|
||||
void activePort(const QString &portId,const uint &cardId);
|
||||
void haldleDbusSignal(const QDBusMessage &msg);
|
||||
void updateListHeight();
|
||||
|
||||
private:
|
||||
void refreshIcon();
|
||||
@ -130,12 +134,12 @@ private:
|
||||
|
||||
private:
|
||||
QWidget *m_centralWidget;
|
||||
QWidget *m_applicationTitle;
|
||||
DIconButton *m_volumeBtn;
|
||||
QLabel *m_volumeIconMax;
|
||||
VolumeSlider *m_volumeSlider;
|
||||
Dock::TipsWidget *m_soundShow;
|
||||
QVBoxLayout *m_centralLayout;
|
||||
HorizontalSeparator *m_separator;
|
||||
|
||||
DBusAudio *m_audioInter;
|
||||
DBusSink *m_defSinkInter;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user