Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix faulty column width calculation by Qt for the Ubunut font

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-06-02 10:05:15 +02:00
parent 6cd76ff60b
commit d2616c8af8
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/doctree.py
+24 -14
View File
@@ -31,7 +31,8 @@ import nw
from PyQt5.QtCore import Qt, QSize from PyQt5.QtCore import Qt, QSize
from PyQt5.QtGui import QFont, QColor, QIcon from PyQt5.QtGui import QFont, QColor, QIcon
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
qApp, QTreeWidget, QTreeWidgetItem, QAbstractItemView, QMessageBox qApp, QTreeWidget, QTreeWidgetItem, QAbstractItemView, QMessageBox,
QHeaderView
) )
from nw.core import NWDoc from nw.core import NWDoc
@@ -71,20 +72,27 @@ class GuiDocTree(QTreeWidget):
self.setColumnCount(4) self.setColumnCount(4)
self.setHeaderLabels(["Label", "Words", "Inc", "Flags"]) self.setHeaderLabels(["Label", "Words", "Inc", "Flags"])
treeHead = self.headerItem() treeHeadItem = self.headerItem()
treeHead.setTextAlignment(self.C_COUNT, Qt.AlignRight) treeHeadItem.setTextAlignment(self.C_COUNT, Qt.AlignRight)
treeHead.setToolTip(self.C_NAME, "Item label") treeHeadItem.setToolTip(self.C_NAME, "Item label")
treeHead.setToolTip(self.C_COUNT, "Word count") treeHeadItem.setToolTip(self.C_COUNT, "Word count")
treeHead.setToolTip(self.C_EXPORT, "Include in build") treeHeadItem.setToolTip(self.C_EXPORT, "Include in build")
treeHead.setToolTip(self.C_FLAGS, "Status, class, and layout flags") treeHeadItem.setToolTip(self.C_FLAGS, "Status, class, and layout flags")
# Force the font to fix font sizing issues on some platforms # Force the font to fix font sizing issues on some platforms
# like Ubuntu. This must also be set when the rows are added. # like Ubuntu. This must also be set when the rows are added.
self.setFont(self.theTheme.guiFont) self.setFont(self.theTheme.guiFont)
treeHead.setFont(self.C_NAME, self.theTheme.guiFont) treeHeadItem.setFont(self.C_NAME, self.theTheme.guiFont)
treeHead.setFont(self.C_COUNT,self.theTheme.guiFont) treeHeadItem.setFont(self.C_COUNT,self.theTheme.guiFont)
treeHead.setFont(self.C_EXPORT, self.theTheme.guiFont) treeHeadItem.setFont(self.C_EXPORT, self.theTheme.guiFont)
treeHead.setFont(self.C_FLAGS, self.theTheme.guiFont) treeHeadItem.setFont(self.C_FLAGS, self.theTheme.guiFont)
# Let the last column stretch, and set the minimum size to the
# size of the icon as the default Qt font metrics approach fails
# for some fonts like the Ubuntu font.
treeHeader = self.header()
treeHeader.setStretchLastSection(True)
treeHeader.setMinimumSectionSize(iPx+6)
# Allow Move by Drag & Drop # Allow Move by Drag & Drop
self.setDragEnabled(True) self.setDragEnabled(True)
@@ -100,10 +108,11 @@ class GuiDocTree(QTreeWidget):
# self.setSelectionBehavior(QAbstractItemView.SelectRows) # self.setSelectionBehavior(QAbstractItemView.SelectRows)
# Get user's column width preferences for NAME and COUNT # Get user's column width preferences for NAME and COUNT
for colN, colW in enumerate(self.mainConf.treeColWidth): if len(self.mainConf.treeColWidth) <= 4:
self.setColumnWidth(colN, colW) for colN, colW in enumerate(self.mainConf.treeColWidth):
self.setColumnWidth(colN, colW)
self.resizeColumnToContents(self.C_EXPORT) # The last column should just auto-scale
self.resizeColumnToContents(self.C_FLAGS) self.resizeColumnToContents(self.C_FLAGS)
logger.debug("GuiDocTree initialisation complete") logger.debug("GuiDocTree initialisation complete")
@@ -284,6 +293,7 @@ class GuiDocTree(QTreeWidget):
retVals = [ retVals = [
self.columnWidth(0), self.columnWidth(0),
self.columnWidth(1), self.columnWidth(1),
self.columnWidth(2),
] ]
return retVals return retVals