Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaned up interface #106

Merged
merged 2 commits into from
May 25, 2024
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 .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ PenaltyExcessCharacter: '1'
PenaltyReturnTypeOnItsOwnLine: '20'
PointerAlignment: Left
ReflowComments: 'false'
SortIncludes: 'true'
SortIncludes: 'false'
SortUsingDeclarations: 'true'
SpaceAfterCStyleCast: 'true'
SpaceAfterLogicalNot: 'false'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
name: ${{ matrix.os }} - ${{ matrix.build_type }}
strategy:
matrix:
os: [macos-13, windows-latest]
os: [macos-latest, windows-latest]
build_type: [Debug, Release]
fail-fast: false

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive

Expand Down
1 change: 1 addition & 0 deletions Examples/APVTS_Tutorial/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ target_compile_definitions(${PROJECT_NAME}
FOLEYS_SHOW_GUI_EDITOR_PALLETTE=1
FOLEYS_SAVE_EDITED_GUI_IN_PLUGIN_STATE=0
JUCE_VST3_CAN_REPLACE_VST2=0
JUCE_SILENCE_XCODE_15_LINKER_WARNING=1
JUCE_WEB_BROWSER=0)

foreach(FORMAT ${FORMATS})
Expand Down
1 change: 1 addition & 0 deletions Examples/EqualizerExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ target_compile_definitions(${PROJECT_NAME}
FOLEYS_SAVE_EDITED_GUI_IN_PLUGIN_STATE=0
FOLEYS_ENABLE_BINARY_DATA=1
JUCE_VST3_CAN_REPLACE_VST2=0
JUCE_SILENCE_XCODE_15_LINKER_WARNING=1
JUCE_WEB_BROWSER=0)

foreach(FORMAT ${FORMATS})
Expand Down
1 change: 1 addition & 0 deletions Examples/ExtendingExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ target_compile_definitions(${PROJECT_NAME}
FOLEYS_SHOW_GUI_EDITOR_PALLETTE=1
FOLEYS_SAVE_EDITED_GUI_IN_PLUGIN_STATE=0
JUCE_VST3_CAN_REPLACE_VST2=0
JUCE_SILENCE_XCODE_15_LINKER_WARNING=1
JUCE_WEB_BROWSER=0)

foreach(FORMAT ${FORMATS})
Expand Down
1 change: 1 addition & 0 deletions Examples/FoleysSynth/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ target_compile_definitions(${PROJECT_NAME}
FOLEYS_SHOW_GUI_EDITOR_PALLETTE=1
FOLEYS_SAVE_EDITED_GUI_IN_PLUGIN_STATE=0
JUCE_VST3_CAN_REPLACE_VST2=0
JUCE_SILENCE_XCODE_15_LINKER_WARNING=1
JUCE_WEB_BROWSER=0)

foreach(FORMAT ${FORMATS})
Expand Down
1 change: 1 addition & 0 deletions Examples/PlayerExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,5 @@ target_compile_definitions(${PROJECT_NAME}
FOLEYS_ENABLE_BINARY_DATA=1
FOLEYS_SHOW_GUI_EDITOR_PALLETTE=1
FOLEYS_SAVE_EDITED_GUI_IN_PLUGIN_STATE=0
JUCE_SILENCE_XCODE_15_LINKER_WARNING=1
JUCE_WEB_BROWSER=0)
2 changes: 1 addition & 1 deletion Examples/PlayerExample/Source/MainComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,5 +184,5 @@ void MainComponent::paint (juce::Graphics& g)

void MainComponent::resized()
{
magicBuilder.updateLayout();
magicBuilder.updateLayout (getLocalBounds());
}
1 change: 1 addition & 0 deletions Examples/SignalGenerator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ target_compile_definitions(${PROJECT_NAME}
FOLEYS_SHOW_GUI_EDITOR_PALLETTE=1
FOLEYS_SAVE_EDITED_GUI_IN_PLUGIN_STATE=0
JUCE_VST3_CAN_REPLACE_VST2=0
JUCE_SILENCE_XCODE_15_LINKER_WARNING=1
JUCE_WEB_BROWSER=0)

foreach(FORMAT ${FORMATS})
Expand Down
1 change: 1 addition & 0 deletions Examples/Vanilla/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ target_compile_definitions(${PROJECT_NAME}
FOLEYS_SAVE_EDITED_GUI_IN_PLUGIN_STATE=0
JUCE_VST3_CAN_REPLACE_VST2=0
JUCE_USE_CURL=0
JUCE_SILENCE_XCODE_15_LINKER_WARNING=1
JUCE_WEB_BROWSER=0)

# foreach(FORMAT ${FORMATS})
Expand Down
4 changes: 4 additions & 0 deletions Tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ target_link_libraries (FoleysGUIMagicTests PRIVATE
Catch2::Catch2WithMain
foleys::foleys_gui_magic)

target_compile_definitions(FoleysGUIMagicTests
PUBLIC
JUCE_SILENCE_XCODE_15_LINKER_WARNING=1)

catch_discover_tests (
FoleysGUIMagicTests
TEST_PREFIX foleys_gui_magic.
Expand Down
2 changes: 1 addition & 1 deletion modules/foleys_gui_magic/Editor/foleys_GUITreeEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void GUITreeEditor::resized()
treeView.setBounds (bounds);
}

void GUITreeEditor::setValueTree (juce::ValueTree& refTree)
void GUITreeEditor::setValueTree (const juce::ValueTree& refTree)
{
auto restorer = treeView.getRootItem() != nullptr ? treeView.getOpennessState (true)
: std::unique_ptr<juce::XmlElement>();
Expand Down
2 changes: 1 addition & 1 deletion modules/foleys_gui_magic/Editor/foleys_GUITreeEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class GUITreeEditor : public juce::Component,
void paint (juce::Graphics&) override;
void resized() override;

void setValueTree (juce::ValueTree& refTree);
void setValueTree (const juce::ValueTree& refTree);

void updateTree();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,10 @@ void StylePropertyComponent::resized()

void StylePropertyComponent::mouseDoubleClick (const juce::MouseEvent&)
{
#if FOLEYS_SHOW_GUI_EDITOR_PALLETTE
if (inheritedFrom.isValid())
builder.getMagicToolBox().setNodeToEdit (inheritedFrom);
#endif
}

void StylePropertyComponent::valueTreePropertyChanged (juce::ValueTree& tree, const juce::Identifier& changedProperty)
Expand Down
Loading