Merge pull request #1237 from mypaint/development

Merge development into master

gui/brushmanip.py

@@ -201,7 +201,7 @@ def inactive_cursor(self):
 
     @property
     def active_cursor(self):
-        return Gdk.Cursor.new(Gdk.CursorType.BLANK_CURSOR)
+        return Gdk.Cursor.new_from_name(Gdk.Display.get_default(), "none")
 
     def enter(self, doc, **kwds):
         super(BrushResizeMode, self).enter(doc, **kwds)

gui/buttonmap.py

@@ -561,7 +561,7 @@ def _bp_edit_box_enter_cb(self, evbox, event):
         window = evbox.get_window()
         disp = window.get_display()
         try:  # Wayland themes are a bit incomplete
-            cursor = Gdk.Cursor.new_for_display(disp, Gdk.CursorType.CROSSHAIR)
+            cursor = Gdk.Cursor.new_from_name(disp, "crosshair")
             window.set_cursor(cursor)
         except Exception:
             logger.exception("Cursor setting failed")  # and otherwise ignore

gui/colors/adjbases.py

@@ -112,8 +112,8 @@ def __init__(self, prefs, datapath):
         self._palette = None  #: Current working palette
         self._adjusters = weakref.WeakSet()  #: The set of registered adjusters
         #: Cursor for pickers
-        # FIXME: Use Gdk.Cursor.new_for_display()
-        self._picker_cursor = Gdk.Cursor.new(Gdk.CursorType.CROSSHAIR)
+        self._picker_cursor = Gdk.Cursor.new_from_name(
+            Gdk.Display.get_default(), "crosshair")
         self._datapath = datapath  #: Base path for saving palettes and masks
         self._hue_distorts = None  #: Hue-remapping table for color wheels
         self._prefs = prefs  #: Shared preferences dictionary

gui/colors/hcywheel.py

@@ -431,14 +431,20 @@ def __init__(self):
     def _realize_cb(self, widget):
         display = self.get_window().get_display()
 
-        self.__add_cursor = Gdk.Cursor.new_for_display(
-            display, Gdk.CursorType.PLUS)
-        self.__move_cursor = Gdk.Cursor.new_for_display(
-            display, Gdk.CursorType.FLEUR)
-        self.__move_point_cursor = Gdk.Cursor.new_for_display(
-            display, Gdk.CursorType.CROSSHAIR)
-        self.__rotate_cursor = Gdk.Cursor.new_for_display(
-            display, Gdk.CursorType.EXCHANGE)
+        try:
+            # non-standard cursor
+            self.__add_cursor = Gdk.Cursor.new_from_name(display, "plus")
+        except Exception:
+            self.__add_cursor = Gdk.Cursor.new_from_name(display, "default")
+        self.__move_cursor = Gdk.Cursor.new_from_name(display, "move")
+        self.__move_point_cursor = Gdk.Cursor.new_from_name(
+            display, "crosshair")
+        try:
+            # non-standard cursor
+            self.__rotate_cursor = Gdk.Cursor.new_from_name(
+                display, "exchange")
+        except Exception:
+            self.__rotate_cursor = Gdk.Cursor.new_from_name(display, "grab")
 
     def __leave_cb(self, widget, event):
         # Reset the active objects when the pointer leaves.

gui/cursor.py

@@ -387,10 +387,12 @@ def get_action_cursor(self, action_name, cursor_name=Name.ARROW):
         # Find a small action icon for the overlay
         action = self.app.find_action(action_name)
         if action is None:
-            return Gdk.Cursor.new(Gdk.CursorType.ARROW)
+            return Gdk.Cursor.new_from_name(
+                Gdk.Display.get_default(), "default")
         icon_name = action.get_icon_name()
         if icon_name is None:
-            return Gdk.Cursor.new(Gdk.CursorType.ARROW)
+            return Gdk.Cursor.new_from_name(
+                Gdk.Display.get_default(), "default")
         return self.get_icon_cursor(icon_name, cursor_name)
 
     def get_icon_cursor(self, icon_name, cursor_name=Name.ARROW):

gui/freehand.py

@@ -256,8 +256,7 @@ def _hide_drawing_cursor(self, tdw):
 
         if self._cursor_hidden is None:
             window = tdw.get_window()
-            cursor = Gdk.Cursor.new_for_display(
-                window.get_display(), Gdk.CursorType.BLANK_CURSOR)
+            cursor = Gdk.Cursor.new_from_name(window.get_display(), "none")
             self._cursor_hidden = cursor
 
         tdw.set_override_cursor(self._cursor_hidden)

gui/historypopup.py

@@ -99,8 +99,7 @@ def enter(self):
         self.show_all()
 
         window = self.get_window()
-        cursor = Gdk.Cursor.new_for_display(
-            window.get_display(), Gdk.CursorType.CROSSHAIR)
+        cursor = Gdk.Cursor.new_from_name(window.get_display(), "crosshair")
         window.set_cursor(cursor)
 
     def leave(self, reason):

gui/layermanip.py

@@ -165,8 +165,7 @@ def drag_stop_cb(self, tdw):
             tdw.set_sensitive(False)
 
             window = tdw.get_window()
-            cursor = Gdk.Cursor.new_for_display(
-                window.get_display(), Gdk.CursorType.WATCH)
+            cursor = Gdk.Cursor.new_from_name(window.get_display(), "wait")
             tdw.set_override_cursor(cursor)
 
             self.final_modifiers = self.current_modifiers()

gui/tileddrawwidget.py

@@ -577,8 +577,7 @@ def update_cursor(self):
         elif not layer.get_paintable():
             # Cursor to represent that one cannot draw.
             # Often a red circle with a diagonal bar through it.
-            c = Gdk.Cursor.new_for_display(
-                window.get_display(), Gdk.CursorType.CIRCLE)
+            c = Gdk.Cursor.new_from_name(window.get_display(), "not-allowed")
         elif app is None:
             logger.error("update_cursor: no app")
             return

gui/widgets.py

@@ -170,7 +170,8 @@ def with_wait_cursor(func):
     """python decorator that adds a wait cursor around a function"""
     @functools.wraps(func)
     def wrapper(self, *args, **kwargs):
-        wait_cursor = Gdk.Cursor.new(Gdk.CursorType.WATCH)
+        wait_cursor = Gdk.Cursor.new_from_name(
+            Gdk.Display.get_default(), "wait")
         toplevels = Gtk.Window.list_toplevels()
         toplevels = [t for t in toplevels if t.get_window() is not None]
         for toplevel in toplevels:

gui/windowing.py

@@ -140,14 +140,14 @@ class ChooserPopup (Gtk.Window):
     EDGE_SIZE = 12
     EDGE_CURSORS = {
         None: None,
-        Gdk.WindowEdge.NORTH_EAST: Gdk.CursorType.TOP_RIGHT_CORNER,
-        Gdk.WindowEdge.NORTH_WEST: Gdk.CursorType.TOP_LEFT_CORNER,
-        Gdk.WindowEdge.SOUTH_EAST: Gdk.CursorType.BOTTOM_RIGHT_CORNER,
-        Gdk.WindowEdge.SOUTH_WEST: Gdk.CursorType.BOTTOM_LEFT_CORNER,
-        Gdk.WindowEdge.WEST: Gdk.CursorType.LEFT_SIDE,
-        Gdk.WindowEdge.EAST: Gdk.CursorType.RIGHT_SIDE,
-        Gdk.WindowEdge.SOUTH: Gdk.CursorType.BOTTOM_SIDE,
-        Gdk.WindowEdge.NORTH: Gdk.CursorType.TOP_SIDE,
+        Gdk.WindowEdge.NORTH_EAST: "ne-resize",
+        Gdk.WindowEdge.NORTH_WEST: "nw-resize",
+        Gdk.WindowEdge.SOUTH_EAST: "se-resize",
+        Gdk.WindowEdge.SOUTH_WEST: "sw-resize",
+        Gdk.WindowEdge.WEST: "w-resize",
+        Gdk.WindowEdge.EAST: "e-resize",
+        Gdk.WindowEdge.SOUTH: "s-resize",
+        Gdk.WindowEdge.NORTH: "n-resize",
     }
 
     ## Method defs
@@ -175,7 +175,8 @@ def __init__(self, app, actions, config_name):
         self._prefs_size_key = "%s.window_size" % (config_name,)
         self._resize_info = None   # state during an edge resize
         self._outside_grab_active = False
-        self._outside_cursor = Gdk.Cursor(Gdk.CursorType.LEFT_PTR)
+        self._outside_cursor = Gdk.Cursor.new_from_name(
+            self.get_display(), "default")
         self._popup_info = None
 
         # Initial positioning
@@ -186,7 +187,7 @@ def __init__(self, app, actions, config_name):
         self._edge_cursors = {}
         for edge, cursor in self.EDGE_CURSORS.items():
             if cursor is not None:
-                cursor = Gdk.Cursor(cursor)
+                cursor = Gdk.Cursor.new_from_name(self.get_display(), cursor)
             self._edge_cursors[edge] = cursor
 
         # Default size