mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Changed some obj-C literals to avoid cross-linkage problems in plugins. More introjucer work.

Browse source
This commit is contained in:
Julian Storer 2011-07-07 22:16:51 +01:00
parent 0db8d0403b
commit cf4ecfacac
18 changed files with 236 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

41
extras/Introjucer/Source/Project/jucer_Project.cpp
View file

@ -459,7 +459,7 @@ Image Project::getBigIcon()
if (icon.isValid())
return ImageCache::getFromFile (icon.getFile());
return Image();
return Image::null;
}
Image Project::getSmallIcon()
@ -469,46 +469,9 @@ Image Project::getSmallIcon()
if (icon.isValid())
return ImageCache::getFromFile (icon.getFile());
return Image();
return Image::null;
}
Image Project::getBestIconForSize (int size, bool returnNullIfNothingBigEnough)
{
Image im;
const Image im1 (getSmallIcon());
const Image im2 (getBigIcon());
if (im1.isValid() && im2.isValid())
{
if (im1.getWidth() >= size && im2.getWidth() >= size)
im = im1.getWidth() < im2.getWidth() ? im1 : im2;
else if (im1.getWidth() >= size)
im = im1;
else if (im2.getWidth() >= size)
im = im2;
else
return Image();
}
else
{
im = im1.isValid() ? im1 : im2;
}
if (size == im.getWidth() && size == im.getHeight())
return im;
if (returnNullIfNothingBigEnough && im.getWidth() < size && im.getHeight() < size)
return Image::null;
Image newIm (Image::ARGB, size, size, true, Image::SoftwareImage);
Graphics g (newIm);
g.drawImageWithin (im, 0, 0, size, size,
RectanglePlacement::centred | RectanglePlacement::onlyReduceInSize, false);
return newIm;
}
StringPairArray Project::getPreprocessorDefs() const
{
return parsePreprocessorDefs (getProjectPreprocessorDefs().toString());