Browse Source

Added mouse-up event pressure handling

tags/2021-05-28
jules 9 years ago
parent
commit
ab3e628f36
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      modules/juce_gui_basics/components/juce_Component.cpp
  2. +1
    -1
      modules/juce_gui_basics/components/juce_Component.h
  3. +1
    -1
      modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp

+ 2
- 2
modules/juce_gui_basics/components/juce_Component.cpp View File

@@ -2489,7 +2489,7 @@ void Component::internalMouseDown (MouseInputSource source, Point<float> relativ
}
void Component::internalMouseUp (MouseInputSource source, Point<float> relativePos,
Time time, const ModifierKeys oldModifiers)
Time time, const ModifierKeys oldModifiers, float pressure)
{
if (flags.mouseDownWasBlocked && isCurrentlyBlockedByAnotherModalComponent())
return;
@@ -2500,7 +2500,7 @@ void Component::internalMouseUp (MouseInputSource source, Point<float> relativeP
repaint();
const MouseEvent me (source, relativePos,
oldModifiers, MouseInputSource::invalidPressure, this, this, time,
oldModifiers, pressure, this, this, time,
getLocalPoint (nullptr, source.getLastMouseDownPosition()),
source.getLastMouseDownTime(),
source.getNumberOfMultipleClicks(),


+ 1
- 1
modules/juce_gui_basics/components/juce_Component.h View File

@@ -2301,7 +2301,7 @@ private:
void internalMouseEnter (MouseInputSource, Point<float>, Time);
void internalMouseExit (MouseInputSource, Point<float>, Time);
void internalMouseDown (MouseInputSource, Point<float>, Time, float);
void internalMouseUp (MouseInputSource, Point<float>, Time, const ModifierKeys oldModifiers);
void internalMouseUp (MouseInputSource, Point<float>, Time, const ModifierKeys oldModifiers, float);
void internalMouseDrag (MouseInputSource, Point<float>, Time, float);
void internalMouseMove (MouseInputSource, Point<float>, Time);
void internalMouseWheel (MouseInputSource, Point<float>, Time, const MouseWheelDetails&);


+ 1
- 1
modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp View File

@@ -146,7 +146,7 @@ public:
void sendMouseUp (Component& comp, Point<float> screenPos, Time time, const ModifierKeys oldMods)
{
JUCE_MOUSE_EVENT_DBG ("up")
comp.internalMouseUp (MouseInputSource (this), screenPosToLocalPos (comp, screenPos), time, oldMods);
comp.internalMouseUp (MouseInputSource (this), screenPosToLocalPos (comp, screenPos), time, oldMods, pressure);
}
void sendMouseWheel (Component& comp, Point<float> screenPos, Time time, const MouseWheelDetails& wheel)


Loading…
Cancel
Save