Skip to content

Commit 2aa2ea8

Browse files
committed
Removed obsolete workarounds
1 parent 6586cd5 commit 2aa2ea8

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

Source/LookAndFeel/CustomLookAndFeel.cpp

-18
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,6 @@ CustomLookAndFeel::CustomLookAndFeel()
6969
setColour(juce::TextEditor::backgroundColourId, juce::Colour(0xff5e5e5e));
7070
}
7171

72-
// draw tooltips and menus directly into the editor window on iOS
73-
// https://forum.juce.com/t/popupmenu-not-showing-on-auv3-plugin/17763/10
74-
juce::Component* CustomLookAndFeel::getParentComponentForMenuOptions (const juce::PopupMenu::Options& options)
75-
{
76-
#if JUCE_IOS
77-
if (juce::PluginHostType::getPluginLoadedAs() == juce::AudioProcessor::wrapperType_AudioUnitv3)
78-
{
79-
if (options.getParentComponent() == nullptr && options.getTargetComponent() != nullptr)
80-
return options.getTargetComponent()->getTopLevelComponent();
81-
}
82-
#endif
83-
return LookAndFeel_V2::getParentComponentForMenuOptions (options);
84-
}
85-
8672
// change size of slider textbox
8773
juce::Slider::SliderLayout CustomLookAndFeel::getSliderLayout (juce::Slider& slider)
8874
{
@@ -297,10 +283,6 @@ void CustomLookAndFeel::drawPopupMenuBackground (juce::Graphics& g, int width, i
297283
{
298284
juce::Rectangle<int> bounds (width, height);
299285
auto cornerSize = 10.0f;
300-
301-
// no rounded corners for Mac users until https://forum.juce.com/t/bug-popup-menu-background-and-logic-silicon/43243/10 is fixed
302-
if ((juce::SystemStats::getOperatingSystemType() & juce::SystemStats::MacOSX) != 0)
303-
cornerSize = 0.0f;
304286

305287
g.setColour(findColour(juce::PopupMenu::backgroundColourId));
306288
g.fillRoundedRectangle(bounds.toFloat(), cornerSize);

Source/LookAndFeel/CustomLookAndFeel.h

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ class CustomLookAndFeel : public juce::LookAndFeel_V4
2727
public:
2828
CustomLookAndFeel();
2929

30-
juce::Component* getParentComponentForMenuOptions (const juce::PopupMenu::Options&) override;
31-
3230
juce::Slider::SliderLayout getSliderLayout (juce::Slider&) override;
3331
void drawLinearSlider (juce::Graphics&, int x, int y, int width, int height,
3432
float sliderPos, float minSliderPos, float maxSliderPos,

0 commit comments

Comments
 (0)