From aa200ffeacf9354ec88fa15e2b3efc3d309fdef7 Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 23 Jun 2020 10:08:18 +0100 Subject: [PATCH] Projucer: Fixed some errors when building the live-build engine dll --- .../Source/Utility/Helpers/jucer_MiscUtilities.cpp | 2 +- .../Projucer/Source/Utility/Helpers/jucer_MiscUtilities.h | 2 +- .../Source/Utility/UI/jucer_ProjucerLookAndFeel.cpp | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp b/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp index cf4b4907e9..6c1bb983ff 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp +++ b/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp @@ -390,7 +390,7 @@ int getIndexOfCommentBlockStart (const StringArray& lines, int endIndex) return -1; } -int findBestLineToScrollToForClass (StringArray lines, StringRef className, bool isPlugin) +int findBestLineToScrollToForClass (StringArray lines, const String& className, bool isPlugin) { for (auto line : lines) { diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.h b/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.h index f201e5e6f2..8c4f08dd2f 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.h +++ b/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.h @@ -55,7 +55,7 @@ StringArray getModulesRequiredForComponent() noexcept; StringArray getModulesRequiredForAudioProcessor() noexcept; bool isPIPFile (const File&) noexcept; -int findBestLineToScrollToForClass (StringArray, StringRef, bool isPlugin = false); +int findBestLineToScrollToForClass (StringArray, const String&, bool isPlugin = false); bool isValidJUCEExamplesDirectory (const File&) noexcept; diff --git a/extras/Projucer/Source/Utility/UI/jucer_ProjucerLookAndFeel.cpp b/extras/Projucer/Source/Utility/UI/jucer_ProjucerLookAndFeel.cpp index 18fafbbe61..049ed56bef 100644 --- a/extras/Projucer/Source/Utility/UI/jucer_ProjucerLookAndFeel.cpp +++ b/extras/Projucer/Source/Utility/UI/jucer_ProjucerLookAndFeel.cpp @@ -18,8 +18,10 @@ #include "../../Application/jucer_Headers.h" #include "jucer_ProjucerLookAndFeel.h" -#include "../../Application/jucer_Application.h" -#include "../../Project/UI/jucer_ProjectContentComponent.h" + +#ifndef BUILDING_JUCE_COMPILEENGINE + #include "../../Project/UI/jucer_ProjectContentComponent.h" +#endif //============================================================================== ProjucerLookAndFeel::ProjucerLookAndFeel() @@ -39,9 +41,9 @@ void ProjucerLookAndFeel::drawTabButton (TabBarButton& button, Graphics& g, bool g.fillRect (area); const auto alpha = button.isEnabled() ? ((isMouseOver || isMouseDown) ? 1.0f : 0.8f) : 0.3f; + auto textColour = findColour (defaultTextColourId).withMultipliedAlpha (alpha); #ifndef BUILDING_JUCE_COMPILEENGINE - auto textColour = findColour (defaultTextColourId).withMultipliedAlpha (alpha); auto iconColour = findColour (button.isFrontTab() ? activeTabIconColourId : inactiveTabIconColourId);