Browse Source

Minor fix for Path. Added a missing file.

tags/2021-05-28
Julian Storer 13 years ago
parent
commit
c0fb38c35c
5 changed files with 23 additions and 4 deletions
  1. +5
    -0
      extras/audio plugin host/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h
  2. +6
    -0
      modules/juce_core/native/juce_win32_ComSmartPtr.h
  3. +4
    -4
      modules/juce_graphics/geometry/juce_Path.cpp
  4. +5
    -0
      modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp
  5. +3
    -0
      modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h

+ 5
- 0
extras/audio plugin host/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h View File

@@ -0,0 +1,5 @@
// This is an auto-generated file to redirect any included
// module headers to the correct external folder.
#include "../../../../../modules/juce_audio_utils/juce_audio_utils.h"

+ 6
- 0
modules/juce_core/native/juce_win32_ComSmartPtr.h View File

@@ -66,6 +66,7 @@ public:
#ifndef __MINGW32__
return ::CoCreateInstance (classUUID, 0, dwClsContext, __uuidof (ComClass), (void**) resetAndGetPointerAddress());
#else
jassertfalse; // need to find a mingw equivalent of __uuidof to make this possible
return E_NOTIMPL;
#endif
}
@@ -82,7 +83,12 @@ public:
template <class OtherComClass>
HRESULT QueryInterface (ComSmartPtr<OtherComClass>& destObject) const
{
#ifndef __MINGW32__
return this->QueryInterface (__uuidof (OtherComClass), destObject);
#else
jassertfalse; // need to find a mingw equivalent of __uuidof to make this possible
return E_NOTIMPL;
#endif
}
private:


+ 4
- 4
modules/juce_graphics/geometry/juce_Path.cpp View File

@@ -696,7 +696,7 @@ void Path::addBubble (float x, float y,
if (whichSide == 0)
{
const float halfArrowW = jmin (arrowWidth, w - cs2) * 0.5f;
const float arrowX1 = x + cs + jmax (0.0f, (w - cs2) * arrowPos - halfArrowW);
const float arrowX1 = x + cs + jmax (0.0f, (w - cs2 - arrowWidth)) * arrowPos - halfArrowW);
lineTo (arrowX1, y);
lineTo (tipX, tipY);
lineTo (arrowX1 + halfArrowW * 2.0f, y);
@@ -710,7 +710,7 @@ void Path::addBubble (float x, float y,
if (whichSide == 3)
{
const float halfArrowH = jmin (arrowWidth, h - cs2) * 0.5f;
const float arrowY1 = y + cs + jmax (0.0f, (h - cs2) * arrowPos - halfArrowH);
const float arrowY1 = y + cs + jmax (0.0f, (h - cs2 - arrowWidth) * arrowPos - halfArrowH);
lineTo (x + w, arrowY1);
lineTo (tipX, tipY);
lineTo (x + w, arrowY1 + halfArrowH * 2.0f);
@@ -724,7 +724,7 @@ void Path::addBubble (float x, float y,
if (whichSide == 2)
{
const float halfArrowW = jmin (arrowWidth, w - cs2) * 0.5f;
const float arrowX1 = x + cs + jmax (0.0f, (w - cs2) * arrowPos - halfArrowW);
const float arrowX1 = x + cs + jmax (0.0f, (w - cs2 - arrowWidth) * arrowPos - halfArrowW);
lineTo (arrowX1 + halfArrowW * 2.0f, y + h);
lineTo (tipX, tipY);
lineTo (arrowX1, y + h);
@@ -738,7 +738,7 @@ void Path::addBubble (float x, float y,
if (whichSide == 1)
{
const float halfArrowH = jmin (arrowWidth, h - cs2) * 0.5f;
const float arrowY1 = y + cs + jmax (0.0f, (h - cs2) * arrowPos - halfArrowH);
const float arrowY1 = y + cs + jmax (0.0f, (h - cs2 - arrowWidth) * arrowPos - halfArrowH);
lineTo (x, arrowY1 + halfArrowH * 2.0f);
lineTo (tipX, tipY);
lineTo (x, arrowY1);


+ 5
- 0
modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp View File

@@ -304,6 +304,11 @@ FilePreviewComponent* FileBrowserComponent::getPreviewComponent() const noexcept
return previewComp;
}
DirectoryContentsDisplayComponent* FileBrowserComponent::getDisplayComponent() const noexcept
{
return fileListComponent;
}
//==============================================================================
void FileBrowserComponent::resized()
{


+ 3
- 0
modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h View File

@@ -206,6 +206,9 @@ public:
/** @internal */
FilePreviewComponent* getPreviewComponent() const noexcept;
/** @internal */
DirectoryContentsDisplayComponent* getDisplayComponent() const noexcept;
protected:
/** Returns a list of names and paths for the default places the user might want to look.
Use an empty string to indicate a section break.


Loading…
Cancel
Save