Use theme colours in canvas

open-ephys-plugins · Mar 3, 2025 · 6faedc3 · 6faedc3
1 parent 2a1396f
commit 6faedc3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Source/PCAProjectionAxes.cpp b/Source/PCAProjectionAxes.cpp
@@ -44,15 +44,17 @@ PCAProjectionAxes::PCAProjectionAxes (Electrode* electrode_) : GenericDrawAxes (
     isOverUnit = -1;
 
     rangeUpButton = new UtilityButton ("+");
+    rangeUpButton->setFont(FontOptions ("Fira Code", "Regular", 15.0f));
     rangeUpButton->setRadius (3.0f);
     rangeUpButton->addListener (this);
-    rangeUpButton->setBounds (35, 10, 20, 15);
+    rangeUpButton->setBounds (35, 10, 20, 20);
     addAndMakeVisible (rangeUpButton);
 
     rangeDownButton = new UtilityButton ("-");
+    rangeDownButton->setFont(FontOptions ("Fira Code", "Regular", 15.0f));
     rangeDownButton->setRadius (3.0f);
     rangeDownButton->addListener (this);
-    rangeDownButton->setBounds (10, 10, 20, 15);
+    rangeDownButton->setBounds (10, 10, 20, 20);
     addAndMakeVisible (rangeDownButton);
 
     redrawSpikes = true;

diff --git a/Source/SpikePlot.cpp b/Source/SpikePlot.cpp
@@ -152,11 +152,11 @@ void SpikePlot::setName (const String& name_)
 
 void SpikePlot::paint (Graphics& g)
 {
-    g.setColour (Colours::whitesmoke);
-    g.setFont (20);
+    g.setColour (findColour (ThemeColours::controlPanelText));
+    g.setFont (FontOptions ("Inter", "Regular", 20.0f));
     g.drawText (name, 10, 0, 200, 20, Justification::left, false);
 
-    g.setColour (Colours::grey);
+    g.setColour (findColour (ThemeColours::componentBackground));
     g.fillRoundedRectangle (0, 30, getWidth(), getHeight() - 30, 12.0f);
     g.setColour (Colours::black);
     g.fillRoundedRectangle (10, 40, getWidth() - 20, getHeight() - 50, 8.0f);

diff --git a/Source/SpikeSorterCanvas.cpp b/Source/SpikeSorterCanvas.cpp
@@ -122,7 +122,7 @@ void SpikeSorterCanvas::resized()
 
 void SpikeSorterCanvas::paint (Graphics& g)
 {
-    g.fillAll (Colours::darkgrey);
+    g.fillAll (findColour (ThemeColours::componentParentBackground));
 }
 
 void SpikeSorterCanvas::refresh()