diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp index 30c23f78..b990b05f 100644 --- a/src/mainwidget.cpp +++ b/src/mainwidget.cpp @@ -240,7 +240,7 @@ void MainWidget::setupUi(QWidget *Widget) undoBtn->setIcon(DDciIcon(QString(":/assets/icon_return.dci"))); undoBtn->setMaximumSize(36, 36); undoBtn->setIconSize(QSize(14, 14)); - mainWindow->titlebar()->addWidget(undoBtn, Qt::AlignRight); + // mainWindow->titlebar()->addWidget(undoBtn, Qt::AlignRight); connect(undoBtn, &QPushButton::clicked, m_plainTextEdit, &QPlainTextEdit::undo); connect(m_plainTextEdit, &QPlainTextEdit::undoAvailable, undoBtn, &QPushButton::setEnabled); undoBtn->setEnabled(false); @@ -251,11 +251,22 @@ void MainWidget::setupUi(QWidget *Widget) redoBtn->setIcon(DDciIcon(QString(":/assets/icon_advance.dci"))); redoBtn->setMaximumSize(36, 36); redoBtn->setIconSize(QSize(14, 14)); - mainWindow->titlebar()->addWidget(redoBtn, Qt::AlignRight); + // mainWindow->titlebar()->addWidget(redoBtn, Qt::AlignRight); connect(redoBtn, &QPushButton::clicked, m_plainTextEdit, &QPlainTextEdit::redo); connect(m_plainTextEdit, &QPlainTextEdit::redoAvailable, redoBtn, &QPushButton::setEnabled); redoBtn->setEnabled(false); + QWidget *pWidget = new QWidget; + QHBoxLayout *pLay = new QHBoxLayout; + pWidget->setWindowFlags(pWidget->windowFlags() | Qt::FramelessWindowHint); + pWidget->setContentsMargins(0, 0, 0, 0); + pLay->setContentsMargins(0, 0, 0, 0); + pWidget->setLayout(pLay); + pLay->addWidget(undoBtn); + pLay->addSpacing(10); + pLay->addWidget(redoBtn); + mainWindow->titlebar()->addWidget(pWidget, Qt::AlignRight); + if (DGuiApplicationHelper::instance()->sizeMode() == DGuiApplicationHelper::CompactMode) { languageSelectBox->setFixedSize(160, 24); m_copyBtn->setMaximumSize(QSize(24, 24));