Apply clang-format (2) - This is no fun!

presentation
Ulrich Huber 7 years ago
parent 462cb85558
commit acb9a0ef40
  1. 4
      src/gui/XournalppCursor.cpp
  2. 10
      src/gui/XournalppCursor.h

@ -583,8 +583,8 @@ GdkCursor* XournalppCursor::createCustomDrawDirCursor(int size, bool shift, bool
XOJ_CHECK_TYPE(XournalppCursor);
bool big = control->getSettings()->isShowBigCursor();
bool bright = control->getSettings()->isHighlightPosition();
int newCursorID = CRSR_DRAWDIRNONE + (shift?1:0) + (ctrl?2:0);
int newCursorID = CRSR_DRAWDIRNONE + (shift ? 1 : 0) + (ctrl ? 2 : 0);
gulong flavour = (big ? 1 : 0) | (bright ? 2 : 0) | (gulong) size << 2; // hash of variables for comparison only
if (newCursorID == this->currentCursor && flavour == this->currentCursorFlavour) return NULL;

@ -63,9 +63,9 @@ private:
// One shot drawDir custom cursor -drawn instead of pen/stylus then cleared.
bool drawDirActive = false;
bool drawDirShift = false;
bool drawDirCtrl = false;
//avoid re-assigning same cursor
guint currentCursor = 0; // enum AVAILABLECURSORS
gulong currentCursorFlavour; //for different flavours of a cursor (i.e. drawdir, pen and hilighter custom cursors)
bool drawDirCtrl = false;
// avoid re-assigning same cursor
guint currentCursor = 0; // enum AVAILABLECURSORS
gulong currentCursorFlavour; // for different flavours of a cursor (i.e. drawdir, pen and hilighter custom cursors)
};

Loading…
Cancel
Save