#3769 MacOS workaround for GTK breakage

Xpra-org · Mar 9, 2023 · d772a66 · d772a66
1 parent dd264ac
commit d772a66
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/xpra/client/gl/gl_drivers.py b/xpra/client/gl/gl_drivers.py
@@ -41,7 +41,7 @@
         #"NVIDIA Corporation",
         ],
     "platform"  : [
-        "darwin",           #latest builds fail to render on MacOS
+        #"darwin",
         ],
     }
 

diff --git a/xpra/client/gl/gtk3/gl_client_window.py b/xpra/client/gl/gtk3/gl_client_window.py
@@ -42,6 +42,13 @@ def spinner(self, ok):
             w, h = self.get_size()
             self.repaint(0, 0, w, h)
 
+    def queue_draw_area(self, x, y, w, h):
+        b = self._backing
+        if not b:
+            return
+        rect = (x, y, w, h)
+        b.gl_expose_rect(rect)
+
     def monitor_changed(self, monitor):
         super().monitor_changed(monitor)
         da = self.drawing_area

diff --git a/xpra/client/gtk_base/gtk_client_window_base.py b/xpra/client/gtk_base/gtk_client_window_base.py
@@ -299,6 +299,9 @@ def init_drawing_area(self):
         self.add(widget)
 
     def repaint(self, x, y, w, h):
+        if OSX:
+            self.queue_draw_area(x, y, w, h)
+            return
         widget = self.drawing_area
         #log("repaint%s widget=%s", (x, y, w, h), widget)
         if widget: