upgrade to JUCE 5.4.3. Remove (probably) unused JUCE modules. Remove VST2 target (it's been end-of-life'd by Steinberg and by JUCE)
This commit is contained in:
@ -47,7 +47,7 @@ protected:
|
||||
|
||||
public:
|
||||
/** Destructor. */
|
||||
virtual ~Drawable();
|
||||
~Drawable() override;
|
||||
|
||||
//==============================================================================
|
||||
/** Creates a deep copy of this Drawable object.
|
||||
|
@ -51,7 +51,7 @@ public:
|
||||
DrawableComposite (const DrawableComposite&);
|
||||
|
||||
/** Destructor. */
|
||||
~DrawableComposite();
|
||||
~DrawableComposite() override;
|
||||
|
||||
//==============================================================================
|
||||
/** Sets the parallelogram that defines the target position of the content rectangle when the drawable is rendered.
|
||||
|
@ -43,7 +43,7 @@ public:
|
||||
DrawableImage (const DrawableImage&);
|
||||
|
||||
/** Destructor. */
|
||||
~DrawableImage();
|
||||
~DrawableImage() override;
|
||||
|
||||
//==============================================================================
|
||||
/** Sets the image that this drawable will render. */
|
||||
|
@ -48,7 +48,7 @@ void DrawablePath::setPath (const Path& newPath)
|
||||
|
||||
void DrawablePath::setPath (Path&& newPath)
|
||||
{
|
||||
path = static_cast<Path&&> (newPath);
|
||||
path = std::move (newPath);
|
||||
pathChanged();
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,7 @@ public:
|
||||
DrawablePath (const DrawablePath&);
|
||||
|
||||
/** Destructor. */
|
||||
~DrawablePath();
|
||||
~DrawablePath() override;
|
||||
|
||||
//==============================================================================
|
||||
/** Changes the path that will be drawn.
|
||||
@ -67,7 +67,7 @@ public:
|
||||
|
||||
//==============================================================================
|
||||
/** @internal */
|
||||
Drawable* createCopy() const;
|
||||
Drawable* createCopy() const override;
|
||||
|
||||
private:
|
||||
//==============================================================================
|
||||
|
@ -45,7 +45,7 @@ public:
|
||||
DrawableRectangle (const DrawableRectangle&);
|
||||
|
||||
/** Destructor. */
|
||||
~DrawableRectangle();
|
||||
~DrawableRectangle() override;
|
||||
|
||||
//==============================================================================
|
||||
/** Sets the rectangle's bounds. */
|
||||
@ -62,7 +62,7 @@ public:
|
||||
|
||||
//==============================================================================
|
||||
/** @internal */
|
||||
Drawable* createCopy() const;
|
||||
Drawable* createCopy() const override;
|
||||
|
||||
private:
|
||||
Parallelogram<float> bounds;
|
||||
|
@ -45,7 +45,7 @@ protected:
|
||||
|
||||
public:
|
||||
/** Destructor. */
|
||||
~DrawableShape();
|
||||
~DrawableShape() override;
|
||||
|
||||
//==============================================================================
|
||||
/** Sets a fill type for the path.
|
||||
|
@ -44,7 +44,7 @@ public:
|
||||
DrawableText (const DrawableText&);
|
||||
|
||||
/** Destructor. */
|
||||
~DrawableText();
|
||||
~DrawableText() override;
|
||||
|
||||
//==============================================================================
|
||||
/** Sets the text to display.*/
|
||||
|
@ -937,8 +937,7 @@ private:
|
||||
|
||||
FillType type (gradient);
|
||||
|
||||
auto gradientTransform = parseTransform (fillXml->getStringAttribute ("gradientTransform"))
|
||||
.followedBy (transform);
|
||||
auto gradientTransform = parseTransform (fillXml->getStringAttribute ("gradientTransform"));
|
||||
|
||||
if (gradient.isRadial)
|
||||
{
|
||||
@ -1202,12 +1201,18 @@ private:
|
||||
auto* di = new DrawableImage();
|
||||
|
||||
setCommonAttributes (*di, xml);
|
||||
di->setImage (image);
|
||||
|
||||
Rectangle<float> imageBounds ((float) xml->getDoubleAttribute ("x", 0.0), (float) xml->getDoubleAttribute ("y", 0.0),
|
||||
(float) xml->getDoubleAttribute ("width", image.getWidth()), (float) xml->getDoubleAttribute ("height", image.getHeight()));
|
||||
|
||||
di->setImage (image.rescaled ((int) imageBounds.getWidth(), (int) imageBounds.getHeight()));
|
||||
|
||||
di->setTransformToFit (imageBounds, RectanglePlacement (parsePlacementFlags (xml->getStringAttribute ("preserveAspectRatio").trim())));
|
||||
|
||||
if (additionalTransform != nullptr)
|
||||
di->setTransform (transform.followedBy (*additionalTransform));
|
||||
di->setTransform (di->getTransform().followedBy (transform).followedBy (*additionalTransform));
|
||||
else
|
||||
di->setTransform (transform);
|
||||
di->setTransform (di->getTransform().followedBy (transform));
|
||||
|
||||
return di;
|
||||
}
|
||||
|
Reference in New Issue
Block a user