From 095772230cf675bff605cbd7943e391ad9853b52 Mon Sep 17 00:00:00 2001 From: liuminghang Date: Tue, 6 Jul 2021 10:10:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug86054?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description: 调整ui布局,后面增加了窗口 Log: 与ui布局有关 Bug: https://pms.uniontech.com/zentao/bug-view-86054.html Change-Id: I7be6bd0cba4f86fd86138b69158bcc14eaca3ea1 --- src/mainwidget.cpp | 30 +++++++++++++++++++++++++----- src/mainwidget.h | 5 +++++ src/resulttextview.cpp | 2 ++ 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp index d4a675f..88c794b 100644 --- a/src/mainwidget.cpp +++ b/src/mainwidget.cpp @@ -117,6 +117,17 @@ void MainWidget::setupUi(QWidget *Widget) m_frameLayout->setContentsMargins(11, 11, 11, 11); m_frameLayout->setObjectName(QStringLiteral("horizontalLayout")); m_frameLayout->setContentsMargins(10, 10, 10, 10); + + //后面加一层窗口,左边空间间距20 + m_frameStack = new QFrame(this); + m_frameStack->setFrameShape(QFrame::StyledPanel); + m_frameStack->setFrameShadow(QFrame::Raised); + m_frameStack->setLineWidth(0); + m_frameStackLayout = new QHBoxLayout(m_frameStack); + m_frameStackLayout->setSpacing(0); + m_frameStackLayout->setObjectName(QStringLiteral("horizontalLayoutStack")); + m_frameStackLayout->setContentsMargins(20, 0, 5, 0); + m_imageview = new ImageView(m_frame); // m_imageview->setObjectName(QStringLiteral("m_imageView")); m_imageview->setLineWidth(0); @@ -129,9 +140,11 @@ void MainWidget::setupUi(QWidget *Widget) m_resultWidget = new DStackedWidget(this); m_resultWidget->setFocusPolicy(Qt::NoFocus); - m_resultWidget->setMinimumWidth(220); + + m_frameStackLayout->addWidget(m_resultWidget); + m_frameStack->setMinimumWidth(220); //宽度最大值为440 - m_resultWidget->setMaximumWidth(440); + m_frameStack->setMaximumWidth(440); m_loadingOcr = new loadingWidget(this); @@ -152,7 +165,7 @@ void MainWidget::setupUi(QWidget *Widget) mainSplitter->setHandleWidth(0);//分割线的宽度 mainSplitter->setChildrenCollapsible(false);//不允许把分割出的子窗口拖小到0，最小值被限定为sizeHint或maxSize/minSize mainSplitter->addWidget(m_frame);//把ui中拖出的各个控件拿走，放到分割器里面 - mainSplitter->addWidget(m_resultWidget); + mainSplitter->addWidget(m_frameStack); QList list; //默认右侧识栏目是220的宽度 list << 620 << 220; @@ -532,6 +545,9 @@ void MainWidget::setIcons(DGuiApplicationHelper::ColorType themeType) pal.setColor(QPalette::Background, QColor(40, 40, 40)); m_resultWidget->setAutoFillBackground(true); m_resultWidget->setPalette(pal); + //增加frame的颜色设置 + m_frameStack->setAutoFillBackground(true); + m_frameStack->setPalette(pal); } if (m_tipIconLabel) { m_tipIconLabel->setPixmap(QPixmap(":/assets/tip_dark.svg")); @@ -588,11 +604,14 @@ void MainWidget::setIcons(DGuiApplicationHelper::ColorType themeType) setAutoFillBackground(true); setPalette(pal); //修复因为切换导致的颜色差 - if (m_resultWidget) { + if (m_resultWidget && m_frameStack) { QPalette pal; pal.setColor(QPalette::Background, QColor(255, 255, 255)); m_resultWidget->setAutoFillBackground(true); m_resultWidget->setPalette(pal); + //增加frame的颜色设置 + m_frameStack->setAutoFillBackground(true); + m_frameStack->setPalette(pal); } if (m_tipIconLabel) { m_tipIconLabel->setPixmap(QPixmap(":/assets/tip_light.svg")); @@ -621,7 +640,8 @@ void MainWidget::setIcons(DGuiApplicationHelper::ColorType themeType) m_frame->setAutoFillBackground(true); m_frame->setPalette(pal); } else if (m_imageview) { - m_imageview->setForegroundBrush(QColor(0, 0, 0, 0)); + //修改为正确的背景setBackgroundBrush + m_imageview->setBackgroundBrush(QColor(248, 248, 248)); QPalette pal; pal.setColor(QPalette::Background, QColor(248, 248, 248)); m_frame->setAutoFillBackground(true); diff --git a/src/mainwidget.h b/src/mainwidget.h index f6ff814..8142a3d 100644 --- a/src/mainwidget.h +++ b/src/mainwidget.h @@ -72,8 +72,13 @@ private: DToolButton *m_copyBtn{nullptr}; DToolButton *m_exportBtn{nullptr}; ImageView *m_imageview{nullptr}; + QHBoxLayout *m_frameLayout{nullptr}; QFrame *m_frame{nullptr}; + + QHBoxLayout *m_frameStackLayout{nullptr}; + QFrame *m_frameStack{nullptr}; + DLabel *m_tipIconLabel{nullptr}; DHorizontalLine *m_line{nullptr}; diff --git a/src/resulttextview.cpp b/src/resulttextview.cpp index ab25af9..d0f8595 100644 --- a/src/resulttextview.cpp +++ b/src/resulttextview.cpp @@ -25,6 +25,7 @@ ResultTextView::ResultTextView(QWidget *parent) m_Menu->addAction(m_actCopy); m_Menu->addAction(m_actCut); m_Menu->addAction(m_actPaste); + this->setLineWidth(6); connect(m_actSelectAll, &QAction::triggered, this, [ = ]() { emit this->selectAll(); @@ -65,5 +66,6 @@ void ResultTextView::contextMenuEvent(QContextMenuEvent *e) void ResultTextView::resizeEvent(QResizeEvent *event) { emit sigChangeSize(); + this->viewport()->setFixedWidth(this->width() - 15); DPlainTextEdit::resizeEvent(event); }