Added ability to draw lines using click+drag when holding Shift

Previously it would require click+click, which also still works.
jack416 · Jul 14, 2020 · 0058cc7 · 0058cc7
1 parent e6521a1
commit 0058cc7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/tiled/stampbrush.cpp b/src/tiled/stampbrush.cpp
@@ -155,6 +155,22 @@ void StampBrush::mousePressed(QGraphicsSceneMouseEvent *event)
 void StampBrush::mouseReleased(QGraphicsSceneMouseEvent *event)
 {
     switch (mBrushBehavior) {
+    case LineStartSet:
+        if (event->button() == Qt::LeftButton) {
+            if (mStampReference != tilePosition()) {
+                doPaint();
+                mBrushBehavior = Line;
+            }
+        }
+        break;
+    case CircleMidSet:
+        if (event->button() == Qt::LeftButton) {
+            if (mStampReference != tilePosition()) {
+                doPaint();
+                updateBrushBehavior();
+            }
+        }
+        break;
     case Capture:
         if (event->button() == Qt::RightButton) {
             endCapture();
@@ -177,13 +193,18 @@ void StampBrush::mouseReleased(QGraphicsSceneMouseEvent *event)
 
 void StampBrush::modifiersChanged(Qt::KeyboardModifiers modifiers)
 {
-    if (mStamp.isEmpty() && !mIsWangFill)
-        return;
+    mModifiers = modifiers;
 
+    if (!mStamp.isEmpty() || mIsWangFill)
+        updateBrushBehavior();
+}
+
+void StampBrush::updateBrushBehavior()
+{
     BrushBehavior brushBehavior = mBrushBehavior;
 
-    if (modifiers & Qt::ShiftModifier) {
-        if (modifiers & Qt::ControlModifier) {
+    if (mModifiers & Qt::ShiftModifier) {
+        if (mModifiers & Qt::ControlModifier) {
             if (brushBehavior == LineStartSet) {
                 brushBehavior = CircleMidSet;
             } else if (brushBehavior != CircleMidSet) {

diff --git a/src/tiled/stampbrush.h b/src/tiled/stampbrush.h
@@ -107,6 +107,7 @@ public slots:
     void beginCapture();
     void endCapture();
 
+    void updateBrushBehavior();
     void updatePreview();
     void updatePreview(QPoint tilePos);
 
@@ -139,6 +140,7 @@ public slots:
      * This stores the current behavior.
      */
     BrushBehavior mBrushBehavior;
+    Qt::KeyboardModifiers mModifiers;
 
     /**
      * The starting position needed for drawing lines and circles.