mirror of
https://codeberg.org/armin/wavetable.git
synced 2026-10-11 16:02:19 +02:00
122 lines
6.7 KiB
Diff
122 lines
6.7 KiB
Diff
|
|
From 6838c7dd9c479315bb245c3663819711d00f7321 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Armin <armin@cherry>
|
||
|
|
Date: Tue, 6 Oct 2026 13:47:14 +0200
|
||
|
|
Subject: [PATCH] yellow/green accents, darker theme, highlighted headers
|
||
|
|
|
||
|
|
---
|
||
|
|
modules/gin_plugin/components/gin_parambox.h | 12 +++---
|
||
|
|
.../lookandfeel/gin_copperlookandfeel.cpp | 42 +++++++++----------
|
||
|
|
2 files changed, 27 insertions(+), 27 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules/gin_plugin/components/gin_parambox.h b/modules/gin_plugin/components/gin_parambox.h
|
||
|
|
index 98c5fa8011..fe5d077704 100644
|
||
|
|
--- a/modules/gin_plugin/components/gin_parambox.h
|
||
|
|
+++ b/modules/gin_plugin/components/gin_parambox.h
|
||
|
|
@@ -33,16 +33,16 @@ private:
|
||
|
|
auto rc = getLocalBounds();
|
||
|
|
gradientRect (g, rc, findColour (PluginLookAndFeel::title1ColourId), findColour (PluginLookAndFeel::title2ColourId));
|
||
|
|
|
||
|
|
- g.setColour (findColour (PluginLookAndFeel::whiteColourId).withAlpha (0.15f));
|
||
|
|
- g.fillRect (rc.removeFromTop (1));
|
||
|
|
+ g.setColour (findColour (PluginLookAndFeel::accentColourId).withAlpha (0.5f));
|
||
|
|
+ g.fillRect (rc.removeFromBottom (1));
|
||
|
|
|
||
|
|
#if JUCE_MAJOR_VERSION >= 8
|
||
|
|
- auto f = juce::Font (juce::FontOptions()).withPointHeight (10.0).withExtraKerningFactor (0.25);
|
||
|
|
+ auto f = juce::Font (juce::FontOptions()).withPointHeight (10.0).withExtraKerningFactor (0.35);
|
||
|
|
#else
|
||
|
|
- auto f = juce::Font().withPointHeight (10.0).withExtraKerningFactor (0.25);
|
||
|
|
+ auto f = juce::Font().withPointHeight (10.0).withExtraKerningFactor (0.35);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
- g.setColour (findColour (PluginLookAndFeel::whiteColourId).withAlpha (0.6f));
|
||
|
|
+ g.setColour (findColour (PluginLookAndFeel::whiteColourId).withAlpha (0.8f));
|
||
|
|
g.drawText (name.toUpperCase(), getLocalBounds(), juce::Justification::centred);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -303,7 +303,7 @@ private:
|
||
|
|
auto rc = getLocalBounds();
|
||
|
|
gradientRect (g, rc, findColour (PluginLookAndFeel::glass1ColourId), findColour (PluginLookAndFeel::glass2ColourId));
|
||
|
|
|
||
|
|
- g.setColour (findColour (PluginLookAndFeel::whiteColourId).withAlpha (0.15f));
|
||
|
|
+ g.setColour (findColour (PluginLookAndFeel::accentColourId).withAlpha (0.3f));
|
||
|
|
g.fillRect (rc.removeFromTop (1));
|
||
|
|
|
||
|
|
if (name.isNotEmpty())
|
||
|
|
diff --git a/modules/gin_plugin/lookandfeel/gin_copperlookandfeel.cpp b/modules/gin_plugin/lookandfeel/gin_copperlookandfeel.cpp
|
||
|
|
index 49e7150117..a130efadd9 100644
|
||
|
|
--- a/modules/gin_plugin/lookandfeel/gin_copperlookandfeel.cpp
|
||
|
|
+++ b/modules/gin_plugin/lookandfeel/gin_copperlookandfeel.cpp
|
||
|
|
@@ -6,24 +6,24 @@ CopperLookAndFeel::CopperLookAndFeel()
|
||
|
|
setColour (whiteColourId, juce::Colour (0xffFFFFFF));
|
||
|
|
setColour (blackColourId, juce::Colour (0xff000000));
|
||
|
|
setColour (displayColourId, juce::Colour (0xff0D0E0F));
|
||
|
|
- setColour (backgroundColourId, juce::Colour (0xff16171A));
|
||
|
|
- setColour (groupColourId, juce::Colour (0xff28292E));
|
||
|
|
- setColour (lightGroupColourId, juce::Colour (0xff35373D));
|
||
|
|
- setColour (grey30ColourId, juce::Colour (0xff585A62));
|
||
|
|
- setColour (grey45ColourId, juce::Colour (0xff797C84));
|
||
|
|
- setColour (grey60ColourId, juce::Colour (0xff9B9EA5));
|
||
|
|
- setColour (grey90ColourId, juce::Colour (0xffE6E6E9));
|
||
|
|
- setColour (glass1ColourId, juce::Colour (0xff0f1012));
|
||
|
|
- setColour (glass2ColourId, juce::Colour (0xff0b0b0d));
|
||
|
|
- setColour (matte1ColourId, juce::Colour (0xff18191C));
|
||
|
|
- setColour (matte2ColourId, juce::Colour (0xff131417));
|
||
|
|
- setColour (title1ColourId, juce::Colour (0xff2A2C30));
|
||
|
|
- setColour (title2ColourId, juce::Colour (0xff25272B));
|
||
|
|
- setColour (accentColourId, juce::Colour (0xffCC8866));
|
||
|
|
-
|
||
|
|
- setColour (WavetableComponent::phaseWaveColourId, juce::Colours::purple);
|
||
|
|
- setColour (WavetableComponent::waveColourId, juce::Colours::green.withAlpha (0.3f));
|
||
|
|
- setColour (WavetableComponent::activeWaveColourId, juce::Colours::yellow);
|
||
|
|
+ setColour (backgroundColourId, juce::Colour (0xff000000));
|
||
|
|
+ setColour (groupColourId, juce::Colour (0xff16171c));
|
||
|
|
+ setColour (lightGroupColourId, juce::Colour (0xff1e2026));
|
||
|
|
+ setColour (grey30ColourId, juce::Colour (0xff3d3f48));
|
||
|
|
+ setColour (grey45ColourId, juce::Colour (0xff5a5d6a));
|
||
|
|
+ setColour (grey60ColourId, juce::Colour (0xff7a7d8c));
|
||
|
|
+ setColour (grey90ColourId, juce::Colour (0xffc8cad4));
|
||
|
|
+ setColour (glass1ColourId, juce::Colour (0xff0b0c10));
|
||
|
|
+ setColour (glass2ColourId, juce::Colour (0xff07080c));
|
||
|
|
+ setColour (matte1ColourId, juce::Colour (0xff0f1116));
|
||
|
|
+ setColour (matte2ColourId, juce::Colour (0xff0b0d11));
|
||
|
|
+ setColour (title1ColourId, juce::Colour (0xff181a21));
|
||
|
|
+ setColour (title2ColourId, juce::Colour (0xff13151b));
|
||
|
|
+ setColour (accentColourId, juce::Colour (0xffDDFF33));
|
||
|
|
+
|
||
|
|
+ setColour (WavetableComponent::phaseWaveColourId, juce::Colour (0xffFF44AA));
|
||
|
|
+ setColour (WavetableComponent::waveColourId, juce::Colour (0xffDDFF33).withAlpha (0.12f));
|
||
|
|
+ setColour (WavetableComponent::activeWaveColourId, juce::Colour (0xffEEFF55));
|
||
|
|
|
||
|
|
setColour (juce::BubbleComponent::backgroundColourId, findColour (backgroundColourId));
|
||
|
|
setColour (juce::BubbleComponent::outlineColourId, findColour (grey45ColourId));
|
||
|
|
@@ -61,7 +61,7 @@ CopperLookAndFeel::CopperLookAndFeel()
|
||
|
|
setColour (juce::PopupMenu::textColourId, findColour (grey60ColourId));
|
||
|
|
setColour (juce::PopupMenu::headerTextColourId, findColour (grey60ColourId));
|
||
|
|
setColour (juce::PopupMenu::highlightedBackgroundColourId, findColour (accentColourId));
|
||
|
|
- setColour (juce::PopupMenu::highlightedTextColourId, findColour (whiteColourId));
|
||
|
|
+ setColour (juce::PopupMenu::highlightedTextColourId, juce::Colours::black);
|
||
|
|
|
||
|
|
setColour (juce::AlertWindow::backgroundColourId, findColour (backgroundColourId));
|
||
|
|
setColour (juce::AlertWindow::textColourId, findColour (grey60ColourId));
|
||
|
|
@@ -170,7 +170,7 @@ void CopperLookAndFeel::drawRotarySlider (juce::Graphics& g, int x, int y, int w
|
||
|
|
auto depth = (float)slider.getProperties()["modDepth"];
|
||
|
|
bool bipolar = (bool)slider.getProperties()["modBipolar"];
|
||
|
|
|
||
|
|
- g.setColour (slider.findColour (GinLookAndFeel::whiteColourId, true).withAlpha (0.9f));
|
||
|
|
+ g.setColour (slider.findColour (GinLookAndFeel::accentColourId, true).withAlpha (0.6f));
|
||
|
|
|
||
|
|
juce::Path filledArc;
|
||
|
|
if (bipolar)
|
||
|
|
@@ -190,7 +190,7 @@ void CopperLookAndFeel::drawRotarySlider (juce::Graphics& g, int x, int y, int w
|
||
|
|
|
||
|
|
if (slider.getProperties().contains ("modValues") && slider.isEnabled())
|
||
|
|
{
|
||
|
|
- g.setColour (slider.findColour (GinLookAndFeel::whiteColourId, true).withAlpha (0.9f));
|
||
|
|
+ g.setColour (slider.findColour (GinLookAndFeel::accentColourId, true).withAlpha (0.7f));
|
||
|
|
|
||
|
|
auto varArray = slider.getProperties()["modValues"];
|
||
|
|
if (varArray.isArray())
|
||
|
|
--
|
||
|
|
2.54.0 (Apple Git-157)
|
||
|
|
|