From 9afac59a6058f3f915690a1e48ccd8f9533bb2de Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 27 Jul 2012 10:32:32 +0100 Subject: [PATCH] Introjucer: dragging exporter treeview fix. Audio plugin demo algorithm fix. --- extras/Introjucer/Source/Project/jucer_ConfigPage.cpp | 2 +- extras/audio plugin demo/Source/PluginProcessor.cpp | 2 +- modules/juce_gui_basics/windows/juce_TooltipWindow.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extras/Introjucer/Source/Project/jucer_ConfigPage.cpp b/extras/Introjucer/Source/Project/jucer_ConfigPage.cpp index e1cf0dd02b..cd998220d3 100644 --- a/extras/Introjucer/Source/Project/jucer_ConfigPage.cpp +++ b/extras/Introjucer/Source/Project/jucer_ConfigPage.cpp @@ -396,7 +396,7 @@ namespace ProjectSettingsTreeClasses void itemDropped (const DragAndDropTarget::SourceDetails& dragSourceDetails, int insertIndex) { int oldIndex = dragSourceDetails.description.toString().getTrailingIntValue(); - exportersTree.moveChild (oldIndex, insertIndex, project.getUndoManagerFor (exportersTree)); + exportersTree.moveChild (oldIndex, jmax (0, insertIndex - 1), project.getUndoManagerFor (exportersTree)); } //============================================================================== diff --git a/extras/audio plugin demo/Source/PluginProcessor.cpp b/extras/audio plugin demo/Source/PluginProcessor.cpp index 50356489ca..f642e66cf8 100644 --- a/extras/audio plugin demo/Source/PluginProcessor.cpp +++ b/extras/audio plugin demo/Source/PluginProcessor.cpp @@ -257,7 +257,7 @@ void JuceDemoPluginAudioProcessor::processBlock (AudioSampleBuffer& buffer, Midi const float in = channelData[i]; channelData[i] += delayData[dp]; delayData[dp] = (delayData[dp] + in) * delay; - if (++dp > delayBuffer.getNumSamples()) + if (++dp >= delayBuffer.getNumSamples()) dp = 0; } } diff --git a/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp b/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp index f237b73e55..c95daef01a 100644 --- a/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp @@ -118,7 +118,7 @@ String TooltipWindow::getTipFor (Component* const c) { if (c != nullptr && Process::isForegroundProcess() - && ! Component::isMouseButtonDownAnywhere()) + && ! ModifierKeys::getCurrentModifiers().isAnyMouseButtonDown()) { TooltipClient* const ttc = dynamic_cast (c);