mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Merge branch 'develop' of /Volumes/Shared Folders/juce/juce into develop

Browse source
This commit is contained in:
Felix Faire 2014-11-13 14:31:49 +00:00
commit 2afab50188
5 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
extras/Introjucer/Source/Application/jucer_MainWindow.cpp
View file

@ -292,7 +292,7 @@ void MainWindow::showNewProjectWizard()
{
jassert (currentProject == nullptr);
setContentOwned (createNewProjectWizardComponent(), true);
centreWithSize(900, 630);
centreWithSize (900, 630);
setVisible (true);
addToDesktop();
getContentComponent()->grabKeyboardFocus();

2
extras/Introjucer/Source/Wizards/jucer_NewProjectWizard.h
View file

@ -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;
}

2
extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h
View file

@ -40,8 +40,6 @@ struct GUIAppWizard : public NewProjectWizard
createFileCreationOptionComboBox (setupComp, itemsCreated,
StringArray (fileOptions, numElementsInArray (fileOptions)))
.setSelectedId (2);
}
Result processResultsFromSetupItems (WizardComp& setupComp)

13
modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp
View file

@ -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));

3
modules/juce_tracktion_marketplace/juce_module_info
View file

@ -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",