Cursor tweaks and code cleanup

- CursorManager code cleanup.
- Diagonal and flat curve cursors now use our bundled cursor icons.
  Icons are now less intrusive, allowing you to see what's going on
  under them as you manipulate the nodes.
- New small crosshair icon for curves.
This commit is contained in:
Morgan Hardwood
2018-08-28 23:45:48 +02:00
parent 54ff8788e6
commit 8bc0df571e
7 changed files with 333 additions and 141 deletions

View File

@@ -22,60 +22,57 @@
#include <gtkmm.h>
enum CursorShape {
CSUndefined,
CSAddColPicker,
CSArrow,
CSCropSelect,
CSCrosshair,
CSHandOpen,
CSEmpty,
CSHandClosed,
CSHandOpen,
CSMove,
CSMoveLeft,
CSMoveRight,
CSResizeWidth,
CSResizeHeight,
CSResizeDiagonal,
CSResizeTopLeft,
CSResizeTopRight,
CSResizeBottomLeft,
CSResizeBottomRight,
CSMove2D,
CSMove1DH,
CSMove1DV,
CSMove2D,
CSMoveLeft,
CSMoveRight,
CSMoveRotate,
CSSpotWB,
CSAddColPicker,
CSCropSelect,
CSStraighten,
CSPlus,
CSWait,
CSEmpty
CSResizeBottomLeft,
CSResizeBottomRight,
CSResizeDiagonal,
CSResizeHeight,
CSResizeTopLeft,
CSResizeTopRight,
CSResizeWidth,
CSSpotWB,
CSStraighten,
CSUndefined,
CSWait
};
class CursorManager
{
private:
Glib::RefPtr<Gdk::Cursor> cResizeWidth;
Glib::RefPtr<Gdk::Cursor> cResizeHeight;
Glib::RefPtr<Gdk::Cursor> cResizeTopLeft;
Glib::RefPtr<Gdk::Cursor> cResizeTopRight;
Glib::RefPtr<Gdk::Cursor> cResizeBottomLeft;
Glib::RefPtr<Gdk::Cursor> cResizeBottomRight;
Glib::RefPtr<Gdk::Cursor> cCropDraw;
Glib::RefPtr<Gdk::Cursor> cCropMove;
Glib::RefPtr<Gdk::Cursor> cLeftTanMove;
Glib::RefPtr<Gdk::Cursor> cRightTanMove;
Glib::RefPtr<Gdk::Cursor> cNormal;
Glib::RefPtr<Gdk::Cursor> cCropSelection;
Glib::RefPtr<Gdk::Cursor> cAdd;
Glib::RefPtr<Gdk::Cursor> cWait;
Glib::RefPtr<Gdk::Cursor> cCrosshair;
Glib::RefPtr<Gdk::Cursor> cHandOpen;
Glib::RefPtr<Gdk::Cursor> cHandClosed;
Glib::RefPtr<Gdk::Cursor> cWB;
Glib::RefPtr<Gdk::Cursor> cAddPicker;
Glib::RefPtr<Gdk::Cursor> cHidden;
Glib::RefPtr<Gdk::Cursor> cMove2D;
Glib::RefPtr<Gdk::Cursor> cCropDraw;
Glib::RefPtr<Gdk::Cursor> cCrosshair;
Glib::RefPtr<Gdk::Cursor> cHandClosed;
Glib::RefPtr<Gdk::Cursor> cHandOpen;
Glib::RefPtr<Gdk::Cursor> cEmpty;
Glib::RefPtr<Gdk::Cursor> cMoveBL;
Glib::RefPtr<Gdk::Cursor> cMoveBR;
Glib::RefPtr<Gdk::Cursor> cMoveL;
Glib::RefPtr<Gdk::Cursor> cMoveR;
Glib::RefPtr<Gdk::Cursor> cMoveTL;
Glib::RefPtr<Gdk::Cursor> cMoveTR;
Glib::RefPtr<Gdk::Cursor> cMoveX;
Glib::RefPtr<Gdk::Cursor> cMoveY;
Glib::RefPtr<Gdk::Cursor> cMoveXY;
Glib::RefPtr<Gdk::Cursor> cRotate;
Glib::RefPtr<Gdk::Cursor> cWB;
Glib::RefPtr<Gdk::Cursor> cWait;
Glib::RefPtr<Gdk::Display> display;
Glib::RefPtr<Gdk::Window> window;