diff --git a/src/lib_gui/qt/element/QtCodeArea.cpp b/src/lib_gui/qt/element/QtCodeArea.cpp index 586f25c7..a4cbc68f 100644 --- a/src/lib_gui/qt/element/QtCodeArea.cpp +++ b/src/lib_gui/qt/element/QtCodeArea.cpp @@ -233,16 +233,17 @@ void QtCodeArea::lineNumberAreaPaintEvent(QPaintEvent *event) if (block.isVisible() && bottom >= event->rect().top()) { int number = blockNumber + getStartLineNumber(); + int height = std::ceil(blockBoundingRect(block).height()); p.setColor(textColor); if (focusedLineNumbers.find(number) != focusedLineNumbers.end()) { - painter.fillRect(m_lineNumberArea->width() - 8, top, 3, fontMetrics().height() + 1, focusedMarkerColor); + painter.fillRect(m_lineNumberArea->width() - 8, top, 3, height, focusedMarkerColor); } else if (activeLineNumbers.find(number) != activeLineNumbers.end()) { - painter.fillRect(m_lineNumberArea->width() - 8, top, 3, fontMetrics().height() + 1, activeMarkerColor); + painter.fillRect(m_lineNumberArea->width() - 8, top, 3, height, activeMarkerColor); } else if (!m_isActiveFile) { @@ -250,8 +251,7 @@ void QtCodeArea::lineNumberAreaPaintEvent(QPaintEvent *event) } painter.setPen(p); - painter.drawText( - 0, top, m_lineNumberArea->width() - 16, fontMetrics().height(), Qt::AlignRight, QString::number(number)); + painter.drawText(0, top, m_lineNumberArea->width() - 16, height, Qt::AlignRight, QString::number(number)); } block = block.next(); diff --git a/src/lib_gui/qt/window/QtIndexingDialog.cpp b/src/lib_gui/qt/window/QtIndexingDialog.cpp index ee220101..2c63f8a4 100644 --- a/src/lib_gui/qt/window/QtIndexingDialog.cpp +++ b/src/lib_gui/qt/window/QtIndexingDialog.cpp @@ -148,7 +148,7 @@ void QtIndexingDialog::updateRefreshInfo(const RefreshInfo& info) m_clearLabel->setText("Files to clear: " + QString::number(clearCount)); m_indexLabel->setText("Source files to index: " + QString::number(indexCount)); - m_clearLabel->setVisible(clearCount); + m_clearLabel->setVisible(clearCount && info.mode != REFRESH_ALL_FILES); m_indexLabel->setVisible(true); } diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp index d43cbb44..daf1aa63 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp @@ -47,6 +47,7 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row) // font face m_fontFace = new QFontComboBox(this); m_fontFace->setFontFilters(QFontComboBox::MonospacedFonts); + m_fontFace->setWritingSystem(QFontDatabase::Latin); m_fontFace->setEditable(false); addLabelAndWidget("Font Face", m_fontFace, layout, row); row++; @@ -85,7 +86,7 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row) // Linux UI scale - // if (utility::getOsType() == OS_LINUX) + if (utility::getOsType() == OS_LINUX) { // screen addTitle("SCREEN", layout, row);