diff --git a/modules/juce_gui_basics/layout/juce_Viewport.cpp b/modules/juce_gui_basics/layout/juce_Viewport.cpp index 635f8d1260..40f9aa2a59 100644 --- a/modules/juce_gui_basics/layout/juce_Viewport.cpp +++ b/modules/juce_gui_basics/layout/juce_Viewport.cpp @@ -225,9 +225,6 @@ struct Viewport::DragToScrollListener : private MouseListener, void mouseDown (const MouseEvent& e) override { - if (doesMouseEventComponentBlockViewportDrag (e.eventComponent)) - isViewportDragBlocked = true; - offsetX.setPosition (offsetX.getPosition()); offsetY.setPosition (offsetY.getPosition()); ++numTouches; @@ -235,7 +232,7 @@ struct Viewport::DragToScrollListener : private MouseListener, void mouseDrag (const MouseEvent& e) override { - if (numTouches == 1 && ! isViewportDragBlocked) + if (numTouches == 1 && ! doesMouseEventComponentBlockViewportDrag (e.eventComponent)) { auto totalOffset = e.getOffsetFromDragStart().toFloat(); @@ -260,9 +257,6 @@ struct Viewport::DragToScrollListener : private MouseListener, void mouseUp (const MouseEvent& e) override { - if (doesMouseEventComponentBlockViewportDrag (e.eventComponent)) - isViewportDragBlocked = false; - if (--numTouches <= 0) { offsetX.endDrag(); @@ -286,7 +280,6 @@ struct Viewport::DragToScrollListener : private MouseListener, Point originalViewPos; int numTouches = 0; bool isDragging = false; - bool isViewportDragBlocked = false; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DragToScrollListener) };