From b096c16c042eef773b18f4fbe343abb3bf4c5276 Mon Sep 17 00:00:00 2001 From: reuk Date: Tue, 30 Jun 2020 17:23:49 +0100 Subject: [PATCH] FileBrowserComponent: Fix issue where up button was hidden after changing the look and feel --- .../filebrowser/juce_FileBrowserComponent.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp index 21c1c154a1..267983c484 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp @@ -117,10 +117,6 @@ FileBrowserComponent::FileBrowserComponent (int flags_, lookAndFeelChanged(); - addAndMakeVisible (goUpButton.get()); - goUpButton->onClick = [this] { goUp(); }; - goUpButton->setTooltip (TRANS ("Go up to parent directory")); - setRoot (currentRoot); if (filename.isNotEmpty()) @@ -359,6 +355,13 @@ void FileBrowserComponent::lookAndFeelChanged() { goUpButton.reset (getLookAndFeel().createFileBrowserGoUpButton()); + if (auto* buttonPtr = goUpButton.get()) + { + addAndMakeVisible (*buttonPtr); + buttonPtr->onClick = [this] { goUp(); }; + buttonPtr->setTooltip (TRANS ("Go up to parent directory")); + } + currentPathBox.setColour (ComboBox::backgroundColourId, findColour (currentPathBoxBackgroundColourId)); currentPathBox.setColour (ComboBox::textColourId, findColour (currentPathBoxTextColourId)); currentPathBox.setColour (ComboBox::arrowColourId, findColour (currentPathBoxArrowColourId));