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

Minor clean-ups.

Browse source
This commit is contained in:
jules 2012-07-10 11:50:17 +01:00
parent b95258cb20
commit 6fe9e2db73
8 changed files with 90 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -780,7 +780,7 @@ Icon Project::Item::getIcon() const
if (isImageFile())
return Icon (icons.imageDoc, Colours::blue);
return Icon (icons.document, Colours::yellow.darker (1.0f));
return Icon (icons.document, Colours::yellow);
}
else if (isMainGroup())
{

6
extras/Introjucer/Source/Utility/jucer_MiscUtilities.h
View file

@ -62,6 +62,7 @@ struct Icon
{
Icon() : path (nullptr) {}
Icon (const Path& p, const Colour& c) : path (&p), colour (c) {}
Icon (const Path* p, const Colour& c) : path (p), colour (c) {}
void draw (Graphics& g, const Rectangle<float>& area) const
{
@ -74,6 +75,11 @@ struct Icon
}
}
Icon withContrastingColourTo (const Colour& background) const
{
return Icon (path, background.contrasting (colour, 0.6f));
}
const Path* path;
Colour colour;
};

26
modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp
View file

@ -49,13 +49,12 @@ void TabBarButton::paintButton (Graphics& g,
const Rectangle<int> area (getActiveArea());
g.setOrigin (area.getX(), area.getY());
getLookAndFeel()
.drawTabButton (g, area.getWidth(), area.getHeight(),
owner.getTabBackgroundColour (getIndex()),
getIndex(), getButtonText(), *this,
owner.getOrientation(),
isMouseOverButton, isButtonDown,
getToggleState());
getLookAndFeel().drawTabButton (g, area.getWidth(), area.getHeight(),
owner.getTabBackgroundColour (getIndex()),
getIndex(), getButtonText(), *this,
owner.getOrientation(),
isMouseOverButton, isButtonDown,
getToggleState());
}
void TabBarButton::clicked (const ModifierKeys& mods)
@ -86,9 +85,9 @@ bool TabBarButton::hitTest (int mx, int my)
}
Path p;
getLookAndFeel()
.createTabButtonShape (p, area.getWidth(), area.getHeight(), getIndex(), getButtonText(), *this,
owner.getOrientation(), false, false, getToggleState());
getLookAndFeel().createTabButtonShape (p, area.getWidth(), area.getHeight(),
getIndex(), getButtonText(), *this,
owner.getOrientation(), false, false, getToggleState());
return p.contains ((float) (mx - area.getX()),
(float) (my - area.getY()));
@ -325,14 +324,15 @@ void TabbedButtonBar::lookAndFeelChanged()
void TabbedButtonBar::resized()
{
LookAndFeel& lf = getLookAndFeel();
int depth = getWidth();
int length = getHeight();
if (orientation == TabsAtTop || orientation == TabsAtBottom)
std::swap (depth, length);
const int overlap = getLookAndFeel().getTabButtonOverlap (depth)
+ getLookAndFeel().getTabButtonSpaceAroundImage() * 2;
const int overlap = lf.getTabButtonOverlap (depth) + lf.getTabButtonSpaceAroundImage() * 2;
int i, totalLength = overlap;
int numVisibleButtons = tabs.size();
@ -357,7 +357,7 @@ void TabbedButtonBar::resized()
{
if (extraTabsButton == nullptr)
{
addAndMakeVisible (extraTabsButton = getLookAndFeel().createTabBarExtrasButton());
addAndMakeVisible (extraTabsButton = lf.createTabBarExtrasButton());
extraTabsButton->addListener (behindFrontTab);
extraTabsButton->setAlwaysOnTop (true);
extraTabsButton->setTriggeredOnMouseDown (true);

1
modules/juce_gui_basics/layout/juce_TabbedButtonBar.h
View file

@ -81,7 +81,6 @@ protected:
int getIndex() const;
private:
//==============================================================================
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TabBarButton);
};

175
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp
View file

@ -2079,15 +2079,9 @@ int LookAndFeel::getTabButtonSpaceAroundImage()
return 4;
}
void LookAndFeel::createTabButtonShape (Path& p,
int width, int height,
int /*tabIndex*/,
const String& /*text*/,
Button& /*button*/,
TabbedButtonBar::Orientation orientation,
const bool /*isMouseOver*/,
const bool /*isMouseDown*/,
const bool /*isFrontTab*/)
void LookAndFeel::createTabButtonShape (Path& p, int width, int height, int /*tabIndex*/,
const String& /*text*/, Button& /*button*/, TabbedButtonBar::Orientation orientation,
const bool /*isMouseOver*/, const bool /*isMouseDown*/, const bool /*isFrontTab*/)
{
const float w = (float) width;
const float h = (float) height;
@ -2146,16 +2140,10 @@ void LookAndFeel::createTabButtonShape (Path& p,
p = p.createPathWithRoundedCorners (3.0f);
}
void LookAndFeel::fillTabButtonShape (Graphics& g,
const Path& path,
const Colour& preferredColour,
int /*tabIndex*/,
const String& /*text*/,
Button& button,
TabbedButtonBar::Orientation /*orientation*/,
const bool /*isMouseOver*/,
const bool /*isMouseDown*/,
const bool isFrontTab)
void LookAndFeel::fillTabButtonShape (Graphics& g, const Path& path, const Colour& preferredColour,
int /*tabIndex*/, const String& /*text*/, Button& button,
TabbedButtonBar::Orientation /*orientation*/, const bool /*isMouseOver*/,
const bool /*isMouseDown*/, const bool isFrontTab)
{
g.setColour (isFrontTab ? preferredColour
: preferredColour.withMultipliedAlpha (0.9f));
@ -2169,16 +2157,10 @@ void LookAndFeel::fillTabButtonShape (Graphics& g,
g.strokePath (path, PathStrokeType (isFrontTab ? 1.0f : 0.5f));
}
void LookAndFeel::drawTabButtonText (Graphics& g,
int x, int y, int w, int h,
const Colour& preferredBackgroundColour,
int /*tabIndex*/,
const String& text,
Button& button,
TabbedButtonBar::Orientation orientation,
const bool isMouseOver,
const bool isMouseDown,
const bool isFrontTab)
void LookAndFeel::drawTabButtonText (Graphics& g, int x, int y, int w, int h,
const Colour& preferredBackgroundColour, int /*tabIndex*/,
const String& text, Button& button, TabbedButtonBar::Orientation orientation,
const bool isMouseOver, const bool isMouseDown, const bool isFrontTab)
{
int length = w;
int depth = h;
@ -2198,21 +2180,13 @@ void LookAndFeel::drawTabButtonText (Graphics& g,
Justification::centred,
jmax (1, depth / 12));
AffineTransform transform;
AffineTransform t;
if (orientation == TabbedButtonBar::TabsAtLeft)
switch (orientation)
{
transform = transform.rotated (float_Pi * -0.5f)
.translated ((float) x, (float) (y + h));
}
else if (orientation == TabbedButtonBar::TabsAtRight)
{
transform = transform.rotated (float_Pi * 0.5f)
.translated ((float) (x + w), (float) y);
}
else
{
transform = transform.translated ((float) x, (float) y);
case TabbedButtonBar::TabsAtLeft: t = t.rotated (float_Pi * -0.5f).translated ((float) x, (float) (y + h)); break;
case TabbedButtonBar::TabsAtRight: t = t.rotated (float_Pi * 0.5f).translated ((float) (x + w), (float) y); break;
default: t = t.translated ((float) x, (float) y);
}
if (isFrontTab && (button.isColourSpecified (TabbedButtonBar::frontTextColourId) || isColourSpecified (TabbedButtonBar::frontTextColourId)))
@ -2228,53 +2202,32 @@ void LookAndFeel::drawTabButtonText (Graphics& g,
if (! button.isEnabled())
g.setOpacity (0.3f);
textLayout.draw (g, transform);
textLayout.draw (g, t);
}
int LookAndFeel::getTabButtonBestWidth (int /*tabIndex*/,
const String& text,
int tabDepth,
Button&)
int LookAndFeel::getTabButtonBestWidth (int /*tabIndex*/, const String& text, int tabDepth, Button&)
{
Font f (tabDepth * 0.6f);
return f.getStringWidth (text.trim()) + getTabButtonOverlap (tabDepth) * 2;
}
void LookAndFeel::drawTabButton (Graphics& g,
int w, int h,
const Colour& preferredColour,
int tabIndex,
const String& text,
Button& button,
TabbedButtonBar::Orientation orientation,
const bool isMouseOver,
const bool isMouseDown,
const bool isFrontTab)
void LookAndFeel::drawTabButton (Graphics& g, int w, int h, const Colour& preferredColour,
int tabIndex, const String& text, Button& button, TabbedButtonBar::Orientation orientation,
const bool isMouseOver, const bool isMouseDown, const bool isFrontTab)
{
int length = w;
int depth = h;
if (orientation == TabbedButtonBar::TabsAtLeft
|| orientation == TabbedButtonBar::TabsAtRight)
{
std::swap (length, depth);
}
Path tabShape;
createTabButtonShape (tabShape, w, h,
tabIndex, text, button, orientation,
createTabButtonShape (tabShape, w, h, tabIndex, text, button, orientation,
isMouseOver, isMouseDown, isFrontTab);
fillTabButtonShape (g, tabShape, preferredColour,
tabIndex, text, button, orientation,
isMouseOver, isMouseDown, isFrontTab);
const int depth = (orientation == TabbedButtonBar::TabsAtLeft || orientation == TabbedButtonBar::TabsAtRight) ? w : h;
const int indent = getTabButtonOverlap (depth);
int x = 0, y = 0;
if (orientation == TabbedButtonBar::TabsAtLeft
|| orientation == TabbedButtonBar::TabsAtRight)
if (orientation == TabbedButtonBar::TabsAtLeft || orientation == TabbedButtonBar::TabsAtRight)
{
y += indent;
h -= indent * 2;
@ -2290,63 +2243,51 @@ void LookAndFeel::drawTabButton (Graphics& g,
isMouseOver, isMouseDown, isFrontTab);
}
void LookAndFeel::drawTabAreaBehindFrontButton (Graphics& g,
int w, int h,
TabbedButtonBar& tabBar,
void LookAndFeel::drawTabAreaBehindFrontButton (Graphics& g, int w, int h, TabbedButtonBar& tabBar,
TabbedButtonBar::Orientation orientation)
{
const float shadowSize = 0.2f;
float x1 = 0.0f, y1 = 0.0f, x2 = 0.0f, y2 = 0.0f;
Rectangle<int> shadowRect;
float x1 = 0, y1 = 0, x2 = 0, y2 = 0;
Rectangle<int> shadowRect, line;
if (orientation == TabbedButtonBar::TabsAtLeft)
switch (orientation)
{
x1 = (float) w;
x2 = w * (1.0f - shadowSize);
shadowRect.setBounds ((int) x2, 0, w - (int) x2, h);
}
else if (orientation == TabbedButtonBar::TabsAtRight)
{
x2 = w * shadowSize;
shadowRect.setBounds (0, 0, (int) x2, h);
}
else if (orientation == TabbedButtonBar::TabsAtBottom)
{
y2 = h * shadowSize;
shadowRect.setBounds (0, 0, w, (int) y2);
}
else
{
y1 = (float) h;
y2 = h * (1.0f - shadowSize);
shadowRect.setBounds (0, (int) y2, w, h - (int) y2);
case TabbedButtonBar::TabsAtLeft:
x1 = (float) w;
x2 = w * (1.0f - shadowSize);
shadowRect.setBounds ((int) x2, 0, w - (int) x2, h);
line.setBounds (w - 1, 0, 1, h);
break;
case TabbedButtonBar::TabsAtRight:
x2 = w * shadowSize;
shadowRect.setBounds (0, 0, (int) x2, h);
line.setBounds (0, 0, 1, h);
break;
case TabbedButtonBar::TabsAtTop:
y1 = (float) h;
y2 = h * (1.0f - shadowSize);
shadowRect.setBounds (0, (int) y2, w, h - (int) y2);
line.setBounds (0, h - 1, w, 1);
break;
case TabbedButtonBar::TabsAtBottom:
y2 = h * shadowSize;
shadowRect.setBounds (0, 0, w, (int) y2);
line.setBounds (0, 0, w, 1);
break;
default: break;
}
g.setGradientFill (ColourGradient (Colours::black.withAlpha (tabBar.isEnabled() ? 0.3f : 0.15f), x1, y1,
Colours::transparentBlack, x2, y2, false));
shadowRect.expand (2, 2);
g.fillRect (shadowRect);
g.fillRect (shadowRect.expanded (2, 2));
g.setColour (Colour (0x80000000));
if (orientation == TabbedButtonBar::TabsAtLeft)
{
g.fillRect (w - 1, 0, 1, h);
}
else if (orientation == TabbedButtonBar::TabsAtRight)
{
g.fillRect (0, 0, 1, h);
}
else if (orientation == TabbedButtonBar::TabsAtBottom)
{
g.fillRect (0, 0, w, 1);
}
else
{
g.fillRect (0, h - 1, w, 1);
}
g.fillRect (line);
}
Button* LookAndFeel::createTabBarExtrasButton()
@ -2526,7 +2467,7 @@ void LookAndFeel::drawPropertyComponentLabel (Graphics& g, int, int height,
Justification::centredLeft, 2);
}
const Rectangle<int> LookAndFeel::getPropertyComponentContentPosition (PropertyComponent& component)
Rectangle<int> LookAndFeel::getPropertyComponentContentPosition (PropertyComponent& component)
{
const int textW = jmin (200, component.getWidth() / 3);
return Rectangle<int> (textW, 1, component.getWidth() - textW - 1, component.getHeight() - 3);

2
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h
View file

@ -608,7 +608,7 @@ public:
virtual void drawPropertyComponentLabel (Graphics& g, int width, int height,
PropertyComponent& component);
virtual const Rectangle<int> getPropertyComponentContentPosition (PropertyComponent& component);
virtual Rectangle<int> getPropertyComponentContentPosition (PropertyComponent& component);
//==============================================================================
virtual void drawCallOutBoxBackground (CallOutBox& box, Graphics& g, const Path& path, Image& cachedImage);

21
modules/juce_gui_basics/properties/juce_PropertyComponent.cpp
View file

@ -23,29 +23,28 @@
==============================================================================
*/
PropertyComponent::PropertyComponent (const String& name,
const int preferredHeight_)
: Component (name),
preferredHeight (preferredHeight_)
PropertyComponent::PropertyComponent (const String& name, const int preferredHeight_)
: Component (name), preferredHeight (preferredHeight_)
{
jassert (name.isNotEmpty());
}
PropertyComponent::~PropertyComponent()
{
}
PropertyComponent::~PropertyComponent() {}
//==============================================================================
void PropertyComponent::paint (Graphics& g)
{
getLookAndFeel().drawPropertyComponentBackground (g, getWidth(), getHeight(), *this);
getLookAndFeel().drawPropertyComponentLabel (g, getWidth(), getHeight(), *this);
LookAndFeel& lf = getLookAndFeel();
lf.drawPropertyComponentBackground (g, getWidth(), getHeight(), *this);
lf.drawPropertyComponentLabel (g, getWidth(), getHeight(), *this);
}
void PropertyComponent::resized()
{
if (getNumChildComponents() > 0)
getChildComponent (0)->setBounds (getLookAndFeel().getPropertyComponentContentPosition (*this));
Component* const c = getChildComponent(0);
if (c != nullptr)
c->setBounds (getLookAndFeel().getPropertyComponentContentPosition (*this));
}
void PropertyComponent::enablementChanged()

3
modules/juce_gui_basics/windows/juce_CallOutBox.cpp
View file

@ -136,8 +136,7 @@ void CallOutBox::updatePosition (const Rectangle<int>& newAreaToPointTo, const R
targetArea = newAreaToPointTo;
availableArea = newAreaToFitIn;
Rectangle<int> newBounds (0, 0,
content.getWidth() + borderSpace * 2,
Rectangle<int> newBounds (content.getWidth() + borderSpace * 2,
content.getHeight() + borderSpace * 2);
const int hw = newBounds.getWidth() / 2;