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

Added some new versions of Graphics::drawText and drawFittedText that take Rectangle parameters.

Browse source
This commit is contained in:
jules 2012-07-14 11:54:29 +01:00
parent 006e324114
commit dc9e0cb9bb
16 changed files with 87 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/juce_gui_extra/misc/juce_ColourSelector.cpp
View file

@ -215,8 +215,7 @@ public:
void resized()
{
marker.setBounds (0, roundToInt ((getHeight() - edge * 2) * h),
getWidth(), edge * 2);
marker.setBounds (0, roundToInt ((getHeight() - edge * 2) * h), getWidth(), edge * 2);
}
void mouseDown (const MouseEvent& e)
@ -350,8 +349,7 @@ ColourSelector::~ColourSelector()
//==============================================================================
Colour ColourSelector::getCurrentColour() const
{
return ((flags & showAlphaChannel) != 0) ? colour
: colour.withAlpha ((uint8) 0xff);
return ((flags & showAlphaChannel) != 0) ? colour : colour.withAlpha ((uint8) 0xff);
}
void ColourSelector::setCurrentColour (const Colour& c)
@ -435,8 +433,7 @@ void ColourSelector::paint (Graphics& g)
g.setColour (Colours::white.overlaidWith (currentColour).contrasting());
g.setFont (Font (14.0f, Font::bold));
g.drawText (currentColour.toDisplayString ((flags & showAlphaChannel) != 0),
previewArea.getX(), previewArea.getY(), previewArea.getWidth(), previewArea.getHeight(),
Justification::centred, false);
previewArea, Justification::centred, false);
}
if ((flags & showSliders) != 0)