mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-14 00:14:18 +00:00
Code Activity

Browse source
This commit is contained in:
jules 2008-03-10 22:20:24 +00:00
parent 876c9a0f3a
commit b660be06e6
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp
View file

@ -105,7 +105,7 @@ const String AudioDeviceManager::initialise (const int numInputChannelsNeeded,
setMidiInputEnabled (allMidiIns[i], enabledMidiIns.contains (allMidiIns[i]));
if (error.isNotEmpty() && selectDefaultDeviceOnFailure)
initialise (numInputChannelsNeeded, numOutputChannelsNeeded, 0, false);
error = initialise (numInputChannelsNeeded, numOutputChannelsNeeded, 0, false);
setDefaultMidiOutput (e->getStringAttribute (T("defaultMidiOutput")));

1
src/juce_appframework/gui/components/controls/juce_ComboBox.h
View file

@ -326,6 +326,7 @@ public:
textColourId = 0x1000a00, /**< The colour for the text in the box. */
outlineColourId = 0x1000c00, /**< The colour for an outline around the box. */
buttonColourId = 0x1000d00, /**< The base colour for the button (a LookAndFeel class will probably use variations on this). */
arrowColourId = 0x1000e00, /**< The colour for the arrow shape that pops up the menu */
};
//==============================================================================

6
src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp
View file

@ -142,6 +142,7 @@ LookAndFeel::LookAndFeel()
ComboBox::textColourId, 0xff000000,
ComboBox::backgroundColourId, 0xffffffff,
ComboBox::arrowColourId, 0x99000000,
ListBox::backgroundColourId, 0xffffffff,
ListBox::outlineColourId, standardOutlineColour,
@ -1114,15 +1115,14 @@ void LookAndFeel::drawComboBox (Graphics& g, int width, int height,
buttonX + buttonW * (1.0f - arrowX), buttonY + buttonH * 0.55f,
buttonX + buttonW * arrowX, buttonY + buttonH * 0.55f);
g.setColour (Colour (0x99000000));
g.setColour (box.findColour (ComboBox::arrowColourId));
g.fillPath (p);
}
}
const Font LookAndFeel::getComboBoxFont (ComboBox& box)
{
const Font f (jmin (15.0f, box.getHeight() * 0.85f));
return f;
return Font (jmin (15.0f, box.getHeight() * 0.85f));
}
Label* LookAndFeel::createComboBoxTextBox (ComboBox&)