Skip to content

Commit 3caa924

Browse files
committed
font metrics fixes
1 parent 5ca78e7 commit 3caa924

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

NodeGraphQt/custom_widgets/nodes_palette.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,11 @@ def paint(self, painter, option, index):
102102

103103
font = painter.font()
104104
font_metrics = QtGui.QFontMetrics(font)
105-
font_width = font_metrics.width(item.text().replace(' ', '_'))
105+
item_text = item.text().replace(' ', '_')
106+
if hasattr(font_metrics, 'horizontalAdvance'):
107+
font_width = font_metrics.horizontalAdvance(item_text)
108+
else:
109+
font_width = font_metrics.width(item_text)
106110
font_height = font_metrics.height()
107111
text_rect = QtCore.QRectF(
108112
sub_rect.center().x() - (font_width / 2),

NodeGraphQt/widgets/viewer_nav.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ def paint(self, painter, option, index):
7575

7676
font = painter.font()
7777
font_metrics = QtGui.QFontMetrics(font)
78-
font_width = font_metrics.width(
79-
item.text().replace(' ', '_')
80-
)
78+
item_text = item.text().replace(' ', '_')
79+
if hasattr(font_metrics, 'horizontalAdvance'):
80+
font_width = font_metrics.horizontalAdvance(item_text)
81+
else:
82+
font_width = font_metrics.width(item_text)
8183
font_height = font_metrics.height()
8284
text_rect = QtCore.QRectF(
8385
rect.center().x() - (font_width / 2) + txt_offset,
@@ -138,7 +140,10 @@ def add_label_item(self, label, node_id):
138140
item = QtGui.QStandardItem(label)
139141
item.setToolTip(node_id)
140142
metrics = QtGui.QFontMetrics(item.font())
141-
width = metrics.width(item.text()) + 30
143+
if hasattr(metrics, 'horizontalAdvance'):
144+
width = metrics.horizontalAdvance(item.text()) + 30
145+
else:
146+
width = metrics.width(item.text()) + 30
142147
item.setSizeHint(QtCore.QSize(width, 20))
143148
self.model().appendRow(item)
144149
self.selectionModel().setCurrentIndex(

0 commit comments

Comments
 (0)