sync: from linuxdeepin/dde-session-shell

deepin-ci-robot · yixinshark · commit e1424d8fd772 · 2025-08-18T15:28:44.000+08:00
Synchronize source files from linuxdeepin/dde-session-shell. Source-pull-request: linuxdeepin/dde-session-shell#31
diff --git a/src/session-widgets/userframelist.cpp b/src/session-widgets/userframelist.cpp
@@ -45,7 +45,7 @@ UserFrameList::UserFrameList(QWidget *parent)
 
 void UserFrameList::initUI()
 {
-    m_centerWidget = new QWidget;
+    m_centerWidget = new QWidget(this);
     m_centerWidget->setAccessibleName("UserFrameListCenterWidget");
 
     m_flowLayout = new DFlowLayout(m_centerWidget);
@@ -273,6 +273,7 @@ void UserFrameList::updateLayout(int width)
     if (countWidth > 0) {
         if (m_flowLayout->count() <= count) {
             m_scrollArea->setFixedSize(countWidth, userWidgetHeight + 20);
+            m_centerWidget->setMaximumHeight(m_scrollArea->height());
         } else {
             m_scrollArea->setFixedSize(countWidth, (userWidgetHeight + UserFrameSpacing) * 2);
         }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ UserFrameList::UserFrameList(QWidget *parent)`
`45`	`45`
`46`	`46`	`void UserFrameList::initUI()`
`47`	`47`	`{`
`48`		`- m_centerWidget = new QWidget;`
	`48`	`+ m_centerWidget = new QWidget(this);`
`49`	`49`	`m_centerWidget->setAccessibleName("UserFrameListCenterWidget");`
`50`	`50`
`51`	`51`	`m_flowLayout = new DFlowLayout(m_centerWidget);`
`@@ -273,6 +273,7 @@ void UserFrameList::updateLayout(int width)`
`273`	`273`	`if (countWidth > 0) {`
`274`	`274`	`if (m_flowLayout->count() <= count) {`
`275`	`275`	`m_scrollArea->setFixedSize(countWidth, userWidgetHeight + 20);`
	`276`	`+ m_centerWidget->setMaximumHeight(m_scrollArea->height());`
`276`	`277`	`} else {`
`277`	`278`	`m_scrollArea->setFixedSize(countWidth, (userWidgetHeight + UserFrameSpacing) * 2);`
`278`	`279`	`}`