Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-15, windows-latest]
juce: ["8.0.3", "8.0.11"]
juce: ["8.0.13"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ endif()

# Only fetch JUCE when top-level (when used as dependency, JUCE is already available)
if (pluginval_IS_TOP_LEVEL)
CPMAddPackage("gh:juce-framework/juce#8.0.3")
CPMAddPackage("gh:juce-framework/juce#8.0.13")
endif()


Expand Down
8 changes: 4 additions & 4 deletions Source/PluginvalLookAndFeel.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,24 +215,24 @@ class PluginvalLookAndFeel : public juce::LookAndFeel_V4
auto textColour = button.isFrontTab() ? findColour (juce::Label::textColourId)
: findColour (juce::Label::textColourId).withAlpha (0.6f);
g.setColour (textColour);
g.setFont (juce::Font (14.0f));
g.setFont (juce::Font (juce::FontOptions (14.0f)));
g.drawText (button.getButtonText(), area.reduced (12.0f, 0.0f), juce::Justification::centred);
}

int getTabButtonBestWidth (juce::TabBarButton& button, int tabDepth) override
{
auto width = juce::Font (14.0f).getStringWidth (button.getButtonText()) + 40; // Extra padding
auto width = juce::GlyphArrangement::getStringWidthInt (juce::Font (juce::FontOptions (14.0f)), button.getButtonText()) + 40; // Extra padding
return juce::jmax (width, 80);
}

juce::Font getTextButtonFont (juce::TextButton&, int buttonHeight) override
{
return juce::Font (juce::jmin (14.0f, (float) buttonHeight * 0.6f));
return juce::Font (juce::FontOptions (juce::jmin (14.0f, (float) buttonHeight * 0.6f)));
}

juce::Font getLabelFont (juce::Label&) override
{
return juce::Font (14.0f);
return juce::Font (juce::FontOptions (14.0f));
}

void drawTableHeaderColumn (juce::Graphics& g, juce::TableHeaderComponent& header,
Expand Down
5 changes: 4 additions & 1 deletion Source/TestUtilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ static std::unique_ptr<juce::AudioProcessorEditor> createAndShowEditorOnMessageT
return {};

jassert (instance.getActiveEditor() == nullptr);
editor.reset (instance.createEditor());
editor.reset (instance.createEditorAndMakeActive());

if (editor)
{
Expand Down Expand Up @@ -177,13 +177,16 @@ static void deleteEditorOnMessageThread (std::unique_ptr<juce::AudioProcessorEdi
{
if (juce::MessageManager::getInstance()->isThisTheMessageThread())
{
editor->processor.editorBeingDeleted (editor.get());
editor.reset();
return;
}

juce::WaitableEvent waiter;
juce::MessageManager::callAsync ([&]
{
if (editor != nullptr)
editor->processor.editorBeingDeleted (editor.get());
editor.reset();
waiter.signal();
});
Expand Down
Loading