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

Fixed high DPI issue in QConfigLayout class

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-11-21 13:16:50 +01:00
parent ba0658ed48
commit 0b065ea76b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/custom.py
+11 -8
View File
@@ -59,8 +59,9 @@ class QConfigLayout(QGridLayout):
self._itemMap = {} self._itemMap = {}
self.setHorizontalSpacing(8) wSp = nw.CONFIG.pxInt(8)
self.setVerticalSpacing(8) self.setHorizontalSpacing(wSp)
self.setVerticalSpacing(wSp)
return return
@@ -107,11 +108,12 @@ class QConfigLayout(QGridLayout):
qLabel = None qLabel = None
raise ValueError("theLabel must be a QLabel") raise ValueError("theLabel must be a QLabel")
qLabel.setContentsMargins(0, 4, 0, 4) hM = nw.CONFIG.pxInt(4)
qLabel.setContentsMargins(0, hM, 0, hM)
self.addWidget(qLabel, self._nextRow, 0, 1, 2, Qt.AlignLeft) self.addWidget(qLabel, self._nextRow, 0, 1, 2, Qt.AlignLeft)
self.setRowStretch(self._nextRow, 0) self.setRowStretch(self._nextRow, 0)
self.setRowStretch(self._nextRow+1, 1) self.setRowStretch(self._nextRow + 1, 1)
self._nextRow += 1 self._nextRow += 1
@@ -140,10 +142,11 @@ class QConfigLayout(QGridLayout):
qWidget = None qWidget = None
raise ValueError("theWidget must be a QWidget") raise ValueError("theWidget must be a QWidget")
qLabel.setIndent(8) wSp = nw.CONFIG.pxInt(8)
qLabel.setIndent(wSp)
if helpText is not None: if helpText is not None:
qHelp = QHelpLabel(str(helpText), self._helpCol, self._fontScale) qHelp = QHelpLabel(str(helpText), self._helpCol, self._fontScale)
qHelp.setIndent(8) qHelp.setIndent(wSp)
labelBox = QVBoxLayout() labelBox = QVBoxLayout()
labelBox.addWidget(qLabel) labelBox.addWidget(qLabel)
@@ -160,13 +163,13 @@ class QConfigLayout(QGridLayout):
controlBox = QHBoxLayout() controlBox = QHBoxLayout()
controlBox.addWidget(qWidget, 0, Qt.AlignVCenter) controlBox.addWidget(qWidget, 0, Qt.AlignVCenter)
controlBox.addWidget(QLabel(theUnit), 0, Qt.AlignVCenter) controlBox.addWidget(QLabel(theUnit), 0, Qt.AlignVCenter)
controlBox.setSpacing(8) controlBox.setSpacing(wSp)
self.addLayout(controlBox, self._nextRow, 1, 1, 1, Qt.AlignRight | Qt.AlignVCenter) self.addLayout(controlBox, self._nextRow, 1, 1, 1, Qt.AlignRight | Qt.AlignVCenter)
elif theButton is not None: elif theButton is not None:
controlBox = QHBoxLayout() controlBox = QHBoxLayout()
controlBox.addWidget(qWidget, 0, Qt.AlignVCenter) controlBox.addWidget(qWidget, 0, Qt.AlignVCenter)
controlBox.addWidget(theButton, 0, Qt.AlignVCenter) controlBox.addWidget(theButton, 0, Qt.AlignVCenter)
controlBox.setSpacing(8) controlBox.setSpacing(wSp)
self.addLayout(controlBox, self._nextRow, 1, 1, 1, Qt.AlignRight | Qt.AlignVCenter) self.addLayout(controlBox, self._nextRow, 1, 1, 1, Qt.AlignRight | Qt.AlignVCenter)
else: else:
self.addWidget(qWidget, self._nextRow, 1, 1, 1, Qt.AlignRight | Qt.AlignVCenter) self.addWidget(qWidget, self._nextRow, 1, 1, 1, Qt.AlignRight | Qt.AlignVCenter)