Navigator should use a different icon while panning

The Navigator uses the same hand icon regardless whether panning
the red square or not, this branch tries to fix that, #4738
Includes a cleanup of icon names, i.e. the crosshair should not be
called the hand.
This commit is contained in:
Morgan Hardwood
2018-08-20 10:44:27 +02:00
parent 9847285c4c
commit 871188a1d8
11 changed files with 179 additions and 26 deletions

View File

@@ -22,11 +22,32 @@
#include <gtkmm.h>
enum CursorShape {
CSUndefined, CSArrow, CSOpenHand, CSClosedHand, CSMove, CSMoveLeft,
CSMoveRight, CSResizeWidth, CSResizeHeight, CSResizeDiagonal,
CSResizeTopLeft, CSResizeTopRight, CSResizeBottomLeft, CSResizeBottomRight,
CSMove2D, CSMove1DH, CSMove1DV, CSMoveRotate,
CSSpotWB, CSAddColPicker, CSCropSelect, CSStraighten, CSPlus, CSWait, CSEmpty
CSUndefined,
CSArrow,
CSCrosshair,
CSHandOpen,
CSHandClosed,
CSMove,
CSMoveLeft,
CSMoveRight,
CSResizeWidth,
CSResizeHeight,
CSResizeDiagonal,
CSResizeTopLeft,
CSResizeTopRight,
CSResizeBottomLeft,
CSResizeBottomRight,
CSMove2D,
CSMove1DH,
CSMove1DV,
CSMoveRotate,
CSSpotWB,
CSAddColPicker,
CSCropSelect,
CSStraighten,
CSPlus,
CSWait,
CSEmpty
};
class CursorManager
@@ -48,8 +69,9 @@ private:
Glib::RefPtr<Gdk::Cursor> cCropSelection;
Glib::RefPtr<Gdk::Cursor> cAdd;
Glib::RefPtr<Gdk::Cursor> cWait;
Glib::RefPtr<Gdk::Cursor> cHand;
Glib::RefPtr<Gdk::Cursor> cClosedHand;
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;