ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: bug fixes

Browse Source 
* fixed gaps in code view line indication for different fonts
* only allow latin fonts in fontpicker
* don't show 'files to clear' for full refresh
* fixed screen scale settings were visible on all platforms
This commit is contained in:
Eberhard Graether
2018-01-22 12:30:31 +01:00
parent 3348c886e5
commit 56cac267a2
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtCodeArea.cpp
+4 -4
View File
@@ -233,16 +233,17 @@ void QtCodeArea::lineNumberAreaPaintEvent(QPaintEvent *event)
if (block.isVisible() && bottom >= event->rect().top()) if (block.isVisible() && bottom >= event->rect().top())
{ {
int number = blockNumber + getStartLineNumber(); int number = blockNumber + getStartLineNumber();
int height = std::ceil(blockBoundingRect(block).height());
p.setColor(textColor); p.setColor(textColor);
if (focusedLineNumbers.find(number) != focusedLineNumbers.end()) 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()) 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) else if (!m_isActiveFile)
{ {
@@ -250,8 +251,7 @@ void QtCodeArea::lineNumberAreaPaintEvent(QPaintEvent *event)
} }
painter.setPen(p); painter.setPen(p);
painter.drawText( painter.drawText(0, top, m_lineNumberArea->width() - 16, height, Qt::AlignRight, QString::number(number));
0, top, m_lineNumberArea->width() - 16, fontMetrics().height(), Qt::AlignRight, QString::number(number));
} }
block = block.next(); block = block.next();
src/lib_gui/qt/window/QtIndexingDialog.cpp
+1 -1
View File
@@ -148,7 +148,7 @@ void QtIndexingDialog::updateRefreshInfo(const RefreshInfo& info)
m_clearLabel->setText("Files to clear: " + QString::number(clearCount)); m_clearLabel->setText("Files to clear: " + QString::number(clearCount));
m_indexLabel->setText("Source files to index: " + QString::number(indexCount)); 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); m_indexLabel->setVisible(true);
} }
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
+2 -1
View File
@@ -47,6 +47,7 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row)
// font face // font face
m_fontFace = new QFontComboBox(this); m_fontFace = new QFontComboBox(this);
m_fontFace->setFontFilters(QFontComboBox::MonospacedFonts); m_fontFace->setFontFilters(QFontComboBox::MonospacedFonts);
m_fontFace->setWritingSystem(QFontDatabase::Latin);
m_fontFace->setEditable(false); m_fontFace->setEditable(false);
addLabelAndWidget("Font Face", m_fontFace, layout, row); addLabelAndWidget("Font Face", m_fontFace, layout, row);
row++; row++;
@@ -85,7 +86,7 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row)
// Linux UI scale // Linux UI scale
// if (utility::getOsType() == OS_LINUX) if (utility::getOsType() == OS_LINUX)
{ {
// screen // screen
addTitle("SCREEN", layout, row); addTitle("SCREEN", layout, row);