From 02f8a125c43484646ccd72a696fb6c115348ec92 Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Tue, 4 Sep 2018 12:47:30 +0100 Subject: [PATCH] Added some more places where we can use the BorderSize from a Label's LookAndFeel --- .../juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp | 2 +- .../properties/juce_TextPropertyComponent.cpp | 5 +++-- modules/juce_gui_basics/widgets/juce_Label.cpp | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp index bfbe6d0db7..d30883a100 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp @@ -1218,7 +1218,7 @@ void LookAndFeel_V2::drawComboBoxTextWhenNothingSelected (Graphics& g, ComboBox& g.setFont (font); - auto textArea = label.getBorderSize().subtractedFrom (label.getLocalBounds()); + auto textArea = getLabelBorderSize (label).subtractedFrom (label.getLocalBounds()); g.drawFittedText (box.getTextWhenNothingSelected(), textArea, label.getJustificationType(), jmax (1, (int) (textArea.getHeight() / font.getHeight())), diff --git a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp index 162f665987..09166336b9 100644 --- a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp @@ -96,8 +96,9 @@ public: { if (getText().isEmpty() && ! isBeingEdited()) { - auto textArea = getBorderSize().subtractedFrom (getLocalBounds()); - auto labelFont = owner.getLookAndFeel().getLabelFont (*this); + auto& lf = owner.getLookAndFeel(); + auto textArea = lf.getLabelBorderSize (*this).subtractedFrom (getLocalBounds()); + auto labelFont = lf.getLabelFont (*this); g.setColour (owner.findColour (TextPropertyComponent::textColourId).withAlpha (alphaToUseForEmptyText)); g.setFont (labelFont); diff --git a/modules/juce_gui_basics/widgets/juce_Label.cpp b/modules/juce_gui_basics/widgets/juce_Label.cpp index a7a1851af5..7591df7be8 100644 --- a/modules/juce_gui_basics/widgets/juce_Label.cpp +++ b/modules/juce_gui_basics/widgets/juce_Label.cpp @@ -155,19 +155,21 @@ void Label::attachToComponent (Component* owner, bool onLeft) void Label::componentMovedOrResized (Component& component, bool /*wasMoved*/, bool /*wasResized*/) { - auto f = getLookAndFeel().getLabelFont (*this); + auto& lf = getLookAndFeel(); + auto f = lf.getLabelFont (*this); + auto border = lf.getLabelBorderSize (*this); if (leftOfOwnerComp) { auto width = jmin (roundToInt (f.getStringWidthFloat (textValue.toString()) + 0.5f) - + getBorderSize().getLeftAndRight(), + + border.getLeftAndRight(), component.getX()); setBounds (component.getX() - width, component.getY(), width, component.getHeight()); } else { - auto height = getBorderSize().getTopAndBottom() + 6 + roundToInt (f.getHeight() + 0.5f); + auto height = border.getTopAndBottom() + 6 + roundToInt (f.getHeight() + 0.5f); setBounds (component.getX(), component.getY() - height, component.getWidth(), height); }