openkylin
/
ukui-search
mirror of https://gitee.com/openkylin/ukui-search.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch '0409-dev' into 'main' 

Fix(frontend): Width of scrollArea is not enough which caused some text displayed incompletely.

See merge request kylin-desktop/ukui-search!12
This commit is contained in:
Zihao Zhang 2021-04-13 07:04:35 +00:00
parent c069f96fa9 c2b9cb7af8
commit 9ec8f32725
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/content-widget.cpp
View File

@ -78,7 +78,7 @@ void ContentWidget::initUI() {
m_resultDetail = new QWidget(m_resultDetailArea); m_resultDetail = new QWidget(m_resultDetailArea);
m_listLyt = new QVBoxLayout(m_resultList); m_listLyt = new QVBoxLayout(m_resultList);
m_detailLyt = new QVBoxLayout(m_resultDetail); m_detailLyt = new QVBoxLayout(m_resultDetail);
m_resultList->setFixedWidth(240); m_resultList->setFixedWidth(236);
m_resultList->setFixedHeight(0); m_resultList->setFixedHeight(0);
m_resultList->setStyleSheet("QWidget{background:transparent;}"); m_resultList->setStyleSheet("QWidget{background:transparent;}");
m_listLyt->setContentsMargins(0, 0, 12, 0); m_listLyt->setContentsMargins(0, 0, 12, 0);

8
src/settings-widget.cpp
View File

@ -233,12 +233,12 @@ void SettingsWidget::setupBlackList(const QStringList& list) {
Q_FOREACH(QString path, list) { Q_FOREACH(QString path, list) {
FolderListItem * item = new FolderListItem(m_dirListWidget, path); FolderListItem * item = new FolderListItem(m_dirListWidget, path);
m_dirListLyt->addWidget(item); m_dirListLyt->addWidget(item);
item->setMaximumWidth(this->width() - 52); item->setMaximumWidth(this->width() - 68);
connect(item, SIGNAL(onDelBtnClicked(const QString&)), this, SLOT(onBtnDelClicked(const QString&))); connect(item, SIGNAL(onDelBtnClicked(const QString&)), this, SLOT(onBtnDelClicked(const QString&)));
m_blockdirs ++; m_blockdirs ++;
} }
this->resize(); this->resize();
m_dirListWidget->setFixedWidth(this->width() - 52); m_dirListWidget->setFixedWidth(this->width() - 68);
// m_dirListLyt->addStretch(); // m_dirListLyt->addStretch();
} }
@ -488,11 +488,11 @@ void SettingsWidget::resize()
// this->setFixedSize(528, 515); // this->setFixedSize(528, 515);
// } // }
if (m_blockdirs <= 4) { if (m_blockdirs <= 4) {
m_dirListArea->setFixedHeight(32 * m_blockdirs); m_dirListArea->setFixedHeight(32 * m_blockdirs + 4);
m_dirListWidget->setFixedHeight(32 * m_blockdirs); m_dirListWidget->setFixedHeight(32 * m_blockdirs);
} else { } else {
m_dirListWidget->setFixedHeight(32 * m_blockdirs); m_dirListWidget->setFixedHeight(32 * m_blockdirs);
m_dirListArea->setFixedHeight(32 * 4); m_dirListArea->setFixedHeight(32 * 4 + 4);
} }
this->setFixedSize(528, 410 + m_dirListArea->height()); this->setFixedSize(528, 410 + m_dirListArea->height());
} }