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

Toolbar: Change the background colour of CustomisationDialog, make it configurable

Browse source
This commit is contained in:
attila 2024-01-10 15:45:05 +01:00
parent 3f52b29432
commit 31dfb05ea3
5 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp
View file

@ -131,6 +131,7 @@ LookAndFeel_V2::LookAndFeel_V2()
Toolbar::buttonMouseDownBackgroundColourId, 0x800000ff,
Toolbar::labelTextColourId, 0xff000000,
Toolbar::editingModeOutlineColourId, 0xffff0000,
Toolbar::customisationDialogBackgroundColourId, 0xfff6f8f9,
DrawableButton::textColourId, 0xff000000,
DrawableButton::textColourOnId, 0xff000000,

1
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V4.cpp
View file

@ -1431,6 +1431,7 @@ void LookAndFeel_V4::initialiseColours()
Toolbar::buttonMouseDownBackgroundColourId, currentColourScheme.getUIColour (ColourScheme::UIColour::widgetBackground).contrasting (0.5f).getARGB(),
Toolbar::labelTextColourId, currentColourScheme.getUIColour (ColourScheme::UIColour::defaultText).getARGB(),
Toolbar::editingModeOutlineColourId, currentColourScheme.getUIColour (ColourScheme::UIColour::outline).getARGB(),
Toolbar::customisationDialogBackgroundColourId, currentColourScheme.getUIColour (ColourScheme::UIColour::widgetBackground).getARGB(),
DrawableButton::textColourId, currentColourScheme.getUIColour (ColourScheme::UIColour::defaultText).getARGB(),
DrawableButton::textColourOnId, currentColourScheme.getUIColour (ColourScheme::UIColour::highlightedText).getARGB(),

5
modules/juce_gui_basics/widgets/juce_Toolbar.cpp
View file

@ -660,7 +660,10 @@ class Toolbar::CustomisationDialog final : public DialogWindow
{
public:
CustomisationDialog (ToolbarItemFactory& factory, Toolbar& bar, int optionFlags)
: DialogWindow (TRANS ("Add/remove items from toolbar"), Colours::white, true, true),
: DialogWindow (TRANS ("Add/remove items from toolbar"),
bar.findColour (Toolbar::customisationDialogBackgroundColourId),
true,
true),
toolbar (bar)
{
setContentOwned (new CustomiserPanel (factory, toolbar, optionFlags), true);

4
modules/juce_gui_basics/widgets/juce_Toolbar.h
View file

@ -246,8 +246,10 @@ public:
labelTextColourId = 0x1003240, /**< A colour to use for drawing the text under buttons
when the style is set to iconsWithText or textOnly. */
editingModeOutlineColourId = 0x1003250 /**< A colour to use for an outline around buttons when
editingModeOutlineColourId = 0x1003250, /**< A colour to use for an outline around buttons when
the customisation dialog is active and the mouse moves over them. */
customisationDialogBackgroundColourId = 0x1003260 /**< A colour used to paint the background of the CustomisationDialog. */
};
//==============================================================================