diff --git a/extras/Introjucer/Source/Application/jucer_MainWindow.cpp b/extras/Introjucer/Source/Application/jucer_MainWindow.cpp index 7c0ba9ac92..b716a2e114 100644 --- a/extras/Introjucer/Source/Application/jucer_MainWindow.cpp +++ b/extras/Introjucer/Source/Application/jucer_MainWindow.cpp @@ -292,7 +292,7 @@ void MainWindow::showNewProjectWizard() { jassert (currentProject == nullptr); setContentOwned (createNewProjectWizardComponent(), true); - centreWithSize(900, 630); + centreWithSize (900, 630); setVisible (true); addToDesktop(); getContentComponent()->grabKeyboardFocus(); diff --git a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizard.h b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizard.h index afe1aaae06..5c455afd3c 100644 --- a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizard.h +++ b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizard.h @@ -43,7 +43,7 @@ static ComboBox& createFileCreationOptionComboBox (Component& setupComp, itemsCreated.add (l); c->setBounds ("parent.width / 2 + 160, 30, parent.width - 30, top + 22"); - + return *c; } diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h index 719f2b92e2..5db645fadb 100644 --- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h +++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h @@ -40,8 +40,6 @@ struct GUIAppWizard : public NewProjectWizard createFileCreationOptionComboBox (setupComp, itemsCreated, StringArray (fileOptions, numElementsInArray (fileOptions))) .setSelectedId (2); - - } Result processResultsFromSetupItems (WizardComp& setupComp) diff --git a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp index e0aa000995..9efad13c17 100644 --- a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp +++ b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp @@ -26,11 +26,8 @@ class MidiKeyboardUpDownButton : public Button { public: MidiKeyboardUpDownButton (MidiKeyboardComponent& comp, const int d) - : Button (String::empty), - owner (comp), - delta (d) + : Button (String::empty), owner (comp), delta (d) { - setOpaque (true); } void clicked() override @@ -60,8 +57,7 @@ private: }; //============================================================================== -MidiKeyboardComponent::MidiKeyboardComponent (MidiKeyboardState& s, - const Orientation o) +MidiKeyboardComponent::MidiKeyboardComponent (MidiKeyboardState& s, Orientation o) : state (s), xOffset (0), blackNoteLength (1), @@ -92,7 +88,7 @@ MidiKeyboardComponent::MidiKeyboardComponent (MidiKeyboardState& s, mouseOverNotes.insertMultiple (0, -1, 32); mouseDownNotes.insertMultiple (0, -1, 32); - setOpaque (true); + colourChanged(); setWantsKeyboardFocus (true); state.addListener (this); @@ -169,6 +165,7 @@ void MidiKeyboardComponent::setScrollButtonsVisible (const bool newCanScroll) void MidiKeyboardComponent::colourChanged() { + setOpaque (findColour (whiteNoteColourId).isOpaque()); repaint(); } @@ -342,7 +339,7 @@ void MidiKeyboardComponent::repaintNote (const int noteNum) void MidiKeyboardComponent::paint (Graphics& g) { - g.fillAll (Colours::white.overlaidWith (findColour (whiteNoteColourId))); + g.fillAll (findColour (whiteNoteColourId)); const Colour lineColour (findColour (keySeparatorLineColourId)); const Colour textColour (findColour (textLabelColourId)); diff --git a/modules/juce_tracktion_marketplace/juce_module_info b/modules/juce_tracktion_marketplace/juce_module_info index fdc531cada..1930f0cc77 100644 --- a/modules/juce_tracktion_marketplace/juce_module_info +++ b/modules/juce_tracktion_marketplace/juce_module_info @@ -6,7 +6,8 @@ "website": "http://www.juce.com/juce", "license": "GPL/Commercial", - "dependencies": [ { "id": "juce_data_structures", "version": "matching" } ], + "dependencies": [ { "id": "juce_data_structures", "version": "matching" }, + { "id": "juce_cryptography", "version": "matching" } ], "include": "juce_tracktion_marketplace.h",