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

fix: 修复跨端协同设备数量变化时列表页面显示不全的问题。

Browse Source 
当跨端协同列表数量变化的时候，没有将子页面高度变化通知父窗口从而更新整个页面高度导致的问题。

Log: 修复跨端协同设备数量变化时列表页面显示不全的问题
But: https://pms.uniontech.com/bug-view-165835.html
Influence: 跨端协同设备变化时，页面显示。
Change-Id: I3a0ac51ea7f412cc530a075ad55b4cc710a5df90
This commit is contained in:
zhaoyingzhen 2022-10-24 15:10:26 +08:00
parent c73ef98002
commit a8b8e6bd00
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frame/window/components/devcollaborationwidget.cpp
View File

@ -31,10 +31,9 @@
#include <QStandardItemModel> #include <QStandardItemModel>
#define TITLE_HEIGHT 16 #define TITLE_HEIGHT 16
#define ITME_WIDTH 310 #define ITEM_WIDTH 310
#define ITEM_HEIGHT 36 #define ITEM_HEIGHT 36
#define LISTVIEW_ITEM_SPACE 2 #define LISTVIEW_ITEM_SPACE 5
#define ITME_SPACE 10
#define PER_DEGREE 14 #define PER_DEGREE 14
DevCollaborationWidget::DevCollaborationWidget(QWidget *parent) DevCollaborationWidget::DevCollaborationWidget(QWidget *parent)
@ -59,6 +58,13 @@ void DevCollaborationWidget::showEvent(QShowEvent *event)
QWidget::showEvent(event); QWidget::showEvent(event);
} }
void DevCollaborationWidget::resizeEvent(QResizeEvent *event)
{
Q_EMIT sizeChanged();
QWidget::resizeEvent(event);
}
void DevCollaborationWidget::initUI() void DevCollaborationWidget::initUI()
{ {
m_deviceListView->setModel(m_viewItemModel); m_deviceListView->setModel(m_viewItemModel);
@ -73,7 +79,7 @@ void DevCollaborationWidget::initUI()
QVBoxLayout *mainLayout = new QVBoxLayout(); QVBoxLayout *mainLayout = new QVBoxLayout();
mainLayout->setMargin(0); mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->setSpacing(ITME_SPACE); mainLayout->setSpacing(0);
mainLayout->addLayout(hLayout); mainLayout->addLayout(hLayout);
mainLayout->addWidget(m_deviceListView); mainLayout->addWidget(m_deviceListView);
@ -107,7 +113,7 @@ void DevCollaborationWidget::loadDevice()
if (!m_deviceListView->isVisible()) if (!m_deviceListView->isVisible())
m_deviceListView->setVisible(true); m_deviceListView->setVisible(true);
m_deviceListView->setFixedSize(ITME_WIDTH, m_deviceListView->count() * ITEM_HEIGHT + LISTVIEW_ITEM_SPACE * (m_deviceListView->count() * 2)); m_deviceListView->setFixedSize(ITEM_WIDTH, m_deviceListView->count() * ITEM_HEIGHT + LISTVIEW_ITEM_SPACE * (m_deviceListView->count() * 2));
} }
resetWidgetSize(); resetWidgetSize();
@ -175,9 +181,9 @@ void DevCollaborationWidget::updateDeviceListView()
void DevCollaborationWidget::resetWidgetSize() void DevCollaborationWidget::resetWidgetSize()
{ {
int height = TITLE_HEIGHT + ITME_SPACE + (m_deviceListView->count() ? m_deviceListView->height() : 0); int height = TITLE_HEIGHT + (m_deviceListView->count() ? m_deviceListView->height() : 0);
setFixedSize(ITME_WIDTH, height); setFixedSize(ITEM_WIDTH, height);
} }
void DevCollaborationWidget::itemClicked(const QModelIndex &index) void DevCollaborationWidget::itemClicked(const QModelIndex &index)

4
frame/window/components/devcollaborationwidget.h
View File

@ -39,8 +39,12 @@ class DevCollaborationWidget : public QWidget
public: public:
explicit DevCollaborationWidget(QWidget *parent = nullptr); explicit DevCollaborationWidget(QWidget *parent = nullptr);
signals:
void sizeChanged();
protected: protected:
void showEvent(QShowEvent *event) override; void showEvent(QShowEvent *event) override;
void resizeEvent(QResizeEvent *event) override;
private slots: private slots:
void loadDevice(); void loadDevice();

9
frame/window/components/displaysettingwidget.cpp
View File

@ -60,7 +60,14 @@ void DisplaySettingWidget::initUI()
setLayout(mainLayout); setLayout(mainLayout);
resizeWidgetHeight();
connect(m_collaborationWidget, &DevCollaborationWidget::sizeChanged,
this, &DisplaySettingWidget::resizeWidgetHeight);
}
void DisplaySettingWidget::resizeWidgetHeight()
{
QMargins margins = this->contentsMargins(); QMargins margins = this->contentsMargins();
setFixedHeight(margins.top() + margins.bottom() + m_brightnessAdjWidget->height() + setFixedHeight(margins.top() + margins.bottom() + m_brightnessAdjWidget->height() +
m_collaborationWidget->height() + m_settingBtn->height() + ItemSpacing * 2); m_collaborationWidget->height() + m_settingBtn->height() + ItemSpacing * 2);
} }

1
frame/window/components/displaysettingwidget.h
View File

@ -39,6 +39,7 @@ public:
private: private:
void initUI(); void initUI();
void resizeWidgetHeight();
private: private:
BrightnessAdjWidget *m_brightnessAdjWidget; // 亮度调整 BrightnessAdjWidget *m_brightnessAdjWidget; // 亮度调整