From 462cb855580f33aaa0e2698cb1121f295884d360 Mon Sep 17 00:00:00 2001 From: Ulrich Huber Date: Tue, 18 Jun 2019 10:56:45 +0200 Subject: [PATCH] Apply clang-format --- src/gui/XournalppCursor.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gui/XournalppCursor.cpp b/src/gui/XournalppCursor.cpp index b8d090cf..1a8aaf35 100644 --- a/src/gui/XournalppCursor.cpp +++ b/src/gui/XournalppCursor.cpp @@ -458,9 +458,10 @@ GdkCursor* XournalppCursor::createHighlighterOrPenCursor(int size, double alpha) int width = size; //create a hash of variables so we notice if one changes despite being the same cursor type: - gulong flavour = (big?1:0) | (bright?2:0) | (gulong)(64*alpha)<<2 | (gulong)size<<9 | (gulong)rgb<<14; - - + gulong flavour = + (big ? 1 : 0) | (bright ? 2 : 0) | (gulong)(64 * alpha) << 2 | (gulong) size << 9 | (gulong) rgb << 14; + + if (flavour != this->currentCursorFlavour) { g_warning("Not the same Flavour!"); @@ -583,8 +584,8 @@ GdkCursor* XournalppCursor::createCustomDrawDirCursor(int size, bool shift, bool bool big = control->getSettings()->isShowBigCursor(); bool bright = control->getSettings()->isHighlightPosition(); - 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 + 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; this->currentCursor = newCursorID;