Browse Source

Couple of minor fixes.

tags/2021-05-28
Julian Storer 15 years ago
parent
commit
564038fe57
11 changed files with 18 additions and 18 deletions
  1. +1
    -1
      extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableDocument.cpp
  2. +2
    -2
      extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableTypeHandler.cpp
  3. +3
    -3
      juce_amalgamated.cpp
  4. +5
    -5
      juce_amalgamated.h
  5. +1
    -1
      src/gui/graphics/drawables/juce_DrawableComposite.h
  6. +1
    -1
      src/gui/graphics/drawables/juce_DrawableImage.h
  7. +1
    -1
      src/gui/graphics/drawables/juce_DrawablePath.h
  8. +1
    -1
      src/gui/graphics/drawables/juce_DrawableText.h
  9. +1
    -1
      src/native/mac/juce_mac_CoreGraphicsContext.mm
  10. +1
    -1
      src/native/windows/juce_win32_Windowing.cpp
  11. +1
    -1
      src/utilities/juce_SelectedItemSet.h

+ 1
- 1
extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableDocument.cpp View File

@@ -373,7 +373,7 @@ const Image DrawableDocument::getImageForIdentifier (const var& imageIdentifier)
g.drawRect (0, 0, 128, 128);
for (int i = -128; i < 128; i += 16)
g.drawLine (i, 0, i + 128, 128);
g.drawLine ((float) i, 0.0f, i + 128.0f, 128.0f);
g.setColour (Colours::darkgrey);
g.drawRect (0, 0, 128, 128);


+ 2
- 2
extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableTypeHandler.cpp View File

@@ -689,8 +689,8 @@ public:
RelativePoint topRight (wrapper.getTargetPositionForTopRight());
RelativePoint bottomLeft (wrapper.getTargetPositionForBottomLeft());
topRight.moveToAbsolute (topLeft.resolve (&item) + Point<float> (im.getWidth(), 0.0f), &item);
bottomLeft.moveToAbsolute (topLeft.resolve (&item) + Point<float> (0.0f, im.getHeight()), &item);
topRight.moveToAbsolute (topLeft.resolve (&item) + Point<float> ((float) im.getWidth(), 0.0f), &item);
bottomLeft.moveToAbsolute (topLeft.resolve (&item) + Point<float> (0.0f, (float) im.getHeight()), &item);
wrapper.setTargetPositionForTopRight (topRight, item.getDocument().getUndoManager());
wrapper.setTargetPositionForBottomLeft (bottomLeft, item.getDocument().getUndoManager());


+ 3
- 3
juce_amalgamated.cpp View File

@@ -240264,7 +240264,7 @@ private:
eventMods = eventMods.withoutMouseButtons();

const MouseEvent e (Desktop::getInstance().getMainMouseSource(),
Point<int>(), eventMods, component, getMouseEventTime(),
Point<int>(), eventMods, component, component, getMouseEventTime(),
Point<int>(), getMouseEventTime(), 1, false);

if (lParam == WM_LBUTTONDOWN || lParam == WM_RBUTTONDOWN)
@@ -264047,7 +264047,7 @@ public:
if (lastClipRectIsValid)
{
lastClipRect = lastClipRect.getIntersection (r);
return ! r.isEmpty();
return ! lastClipRect.isEmpty();
}

return ! isClipEmpty();
@@ -268686,7 +268686,7 @@ public:
if (lastClipRectIsValid)
{
lastClipRect = lastClipRect.getIntersection (r);
return ! r.isEmpty();
return ! lastClipRect.isEmpty();
}

return ! isClipEmpty();


+ 5
- 5
juce_amalgamated.h View File

@@ -54104,7 +54104,7 @@ public:
}

/** True if this item is currently selected. */
bool isSelected (const ParameterType item) const throw()
bool isSelected (ParameterType item) const throw()
{
return selectedItems.contains (item);
}
@@ -58312,7 +58312,7 @@ public:
DrawableComposite (const DrawableComposite& other);

/** Destructor. */
virtual ~DrawableComposite();
~DrawableComposite();

/** Adds a new sub-drawable to this one.

@@ -58530,7 +58530,7 @@ public:
DrawableImage (const DrawableImage& other);

/** Destructor. */
virtual ~DrawableImage();
~DrawableImage();

/** Sets the image that this drawable will render. */
void setImage (const Image& imageToUse);
@@ -58677,7 +58677,7 @@ public:
DrawablePath (const DrawablePath& other);

/** Destructor. */
virtual ~DrawablePath();
~DrawablePath();

/** Changes the path that will be drawn.

@@ -58842,7 +58842,7 @@ public:
DrawableText (const DrawableText& other);

/** Destructor. */
virtual ~DrawableText();
~DrawableText();

/** Sets the text to display.*/
void setText (const String& newText);


+ 1
- 1
src/gui/graphics/drawables/juce_DrawableComposite.h View File

@@ -47,7 +47,7 @@ public:
DrawableComposite (const DrawableComposite& other);
/** Destructor. */
virtual ~DrawableComposite();
~DrawableComposite();
//==============================================================================
/** Adds a new sub-drawable to this one.


+ 1
- 1
src/gui/graphics/drawables/juce_DrawableImage.h View File

@@ -44,7 +44,7 @@ public:
DrawableImage (const DrawableImage& other);
/** Destructor. */
virtual ~DrawableImage();
~DrawableImage();
//==============================================================================
/** Sets the image that this drawable will render. */


+ 1
- 1
src/gui/graphics/drawables/juce_DrawablePath.h View File

@@ -46,7 +46,7 @@ public:
DrawablePath (const DrawablePath& other);
/** Destructor. */
virtual ~DrawablePath();
~DrawablePath();
//==============================================================================
/** Changes the path that will be drawn.


+ 1
- 1
src/gui/graphics/drawables/juce_DrawableText.h View File

@@ -45,7 +45,7 @@ public:
DrawableText (const DrawableText& other);
/** Destructor. */
virtual ~DrawableText();
~DrawableText();
//==============================================================================
/** Sets the text to display.*/


+ 1
- 1
src/native/mac/juce_mac_CoreGraphicsContext.mm View File

@@ -187,7 +187,7 @@ public:
if (lastClipRectIsValid)
{
lastClipRect = lastClipRect.getIntersection (r);
return ! r.isEmpty();
return ! lastClipRect.isEmpty();
}
return ! isClipEmpty();


+ 1
- 1
src/native/windows/juce_win32_Windowing.cpp View File

@@ -1931,7 +1931,7 @@ private:
eventMods = eventMods.withoutMouseButtons();
const MouseEvent e (Desktop::getInstance().getMainMouseSource(),
Point<int>(), eventMods, component, getMouseEventTime(),
Point<int>(), eventMods, component, component, getMouseEventTime(),
Point<int>(), getMouseEventTime(), 1, false);
if (lParam == WM_LBUTTONDOWN || lParam == WM_RBUTTONDOWN)


+ 1
- 1
src/utilities/juce_SelectedItemSet.h View File

@@ -279,7 +279,7 @@ public:
}
/** True if this item is currently selected. */
bool isSelected (const ParameterType item) const throw()
bool isSelected (ParameterType item) const throw()
{
return selectedItems.contains (item);
}


Loading…
Cancel
Save