Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Use currentThreadId to identify thread for PyQt bindings #224

Merged
merged 2 commits into from
Dec 21, 2022
Merged

PR: Use currentThreadId to identify thread for PyQt bindings #224

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce44c1d
Use currentThreadId to identify thread for PyQt bindings
dalthviz Dec 14, 2022
6667f4b
Apply suggestions from code review
dalthviz Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions qtawesome/iconic_font.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
import warnings

# Third party imports
from qtpy.QtCore import (QByteArray, QObject, QPoint, QRect, Qt,
from qtpy import PYSIDE2, PYSIDE6
from qtpy.QtCore import (QObject, QPoint, QRect, Qt,
QSizeF, QRectF, QPointF, QThread)
from qtpy.QtGui import (QColor, QFont, QFontDatabase, QIcon, QIconEngine,
QPainter, QPixmap, QTransform, QPalette, QRawFont,
Expand Down Expand Up @@ -531,7 +532,11 @@ def rawfont(self, prefix, size, hintingPreference=QFont.PreferDefaultHinting):
# (either using a constructor, or by calling loadFromData() or loadFromFile()).
# The QRawFont cannot be moved to a different thread,
# but will have to be recreated in the thread in question.
tid = str(QThread.currentThread())
if PYSIDE2 or PYSIDE6:
# Needed since PySide* bindings doesn't expose QThread.currentThreadId
dalthviz marked this conversation as resolved.
Show resolved Hide resolved
tid = str(QThread.currentThread())
else:
tid = int(QThread.currentThreadId())
if tid not in cache:
dalthviz marked this conversation as resolved.
Show resolved Hide resolved
cache[tid] = {}
def clear_cache(): cache.pop(tid)
Expand Down