Daniel Brötzmann pushed to branch master at gajim / gajim


Commits:
e8e1d53f by wurstsalat at 2022-02-20T15:47:03+01:00
Apply emoji label workaround for MacOS

- - - - -


2 changed files:

- gajim/common/settings.py
- gajim/gtk/conversation/plain_widget.py


Changes:

=====================================
gajim/common/settings.py
=====================================
@@ -212,7 +212,9 @@ def _setup_installation_defaults() -> None:
         if IS_PORTABLE:
             APP_SETTINGS['use_keyring'] = False
 
-        if sys.platform == 'win32':
+        if sys.platform in ('win32', 'darwin'):
+            # Cairo does not support color emojis fonts on
+            # Windows and MacOS
             APP_SETTINGS['dev_use_message_label'] = False
 
     @staticmethod


=====================================
gajim/gtk/conversation/plain_widget.py
=====================================
@@ -51,9 +51,10 @@ def __init__(self, account: str, selectable: bool) -> None:
 
         self._account = account
 
-        # We use a Gtk.Textview on Windows, since there is no support for
-        # rendering color fonts (Emojis) on Windows yet, see:
+        # We use a Gtk.Textview on Windows and MacOS, since there is no support
+        # for rendering color fonts (Emojis) on Windows/MacOS yet, see:
         # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/244
+        # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/9
         if app.settings.get('dev_use_message_label'):
             self._text_widget = MessageLabel(self._account, selectable)
         else:



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/e8e1d53f41e3a482350aef3a22f00f4b1fe7d04d

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/e8e1d53f41e3a482350aef3a22f00f4b1fe7d04d
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to