Interlaced VU and some fallout from base font change (#1222)

- Interlaced vu in place. Closes #1218 - Some fallout in overpaint and spacing from base font getting a bit bigger.
surge-synthesizer · Aug 30, 2024 · 53e912e · 53e912e
1 parent 20b1d26
commit 53e912e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/libs/sst/sst-jucegui b/libs/sst/sst-jucegui
diff --git a/src-ui/app/browser-ui/BrowserPane.cpp b/src-ui/app/browser-ui/BrowserPane.cpp
@@ -66,8 +66,7 @@ struct DriveListBoxModel : juce::ListBoxModel
     {
         if (rowNumber >= 0 && rowNumber < browserPane->roots.size())
         {
-            g.setFont(browserPane->style()->getFont(jcmp::Label::Styles::styleClass,
-                                                    jcmp::Label::Styles::labelfont));
+            g.setFont(browserPane->editor->themeApplier.interMediumFor(12));
 
             // TODO: Style all of these
             auto textColor =
@@ -395,8 +394,7 @@ struct DriveFSListBoxRow : public juce::Component
             auto width = getWidth();
             auto height = getHeight();
 
-            g.setFont(browserPane->style()->getFont(jcmp::Label::Styles::styleClass,
-                                                    jcmp::Label::Styles::labelfont));
+            g.setFont(browserPane->editor->themeApplier.interMediumFor(12));
 
             // TODO: Style all of these
             auto textColor =

diff --git a/src-ui/app/shared/HeaderRegion.cpp b/src-ui/app/shared/HeaderRegion.cpp
@@ -204,11 +204,11 @@ void HeaderRegion::resized()
 
     scMenu->setBounds(b.withTrimmedLeft(1148).withWidth(24));
 
-    cpuLabel->setBounds(b.withTrimmedLeft(975).withWidth(20).withHeight(14));
-    ramLabel->setBounds(b.withTrimmedLeft(975).withWidth(20).withHeight(14).translated(0, 14));
+    cpuLabel->setBounds(b.withTrimmedLeft(962).withWidth(25).withHeight(14));
+    ramLabel->setBounds(b.withTrimmedLeft(962).withWidth(25).withHeight(14).translated(0, 14));
 
-    cpuLevel->setBounds(b.withTrimmedLeft(1000).withWidth(40).withHeight(14));
-    ramLevel->setBounds(b.withTrimmedLeft(1000).withWidth(40).withHeight(14).translated(0, 14));
+    cpuLevel->setBounds(b.withTrimmedLeft(992).withWidth(48).withHeight(14));
+    ramLevel->setBounds(b.withTrimmedLeft(992).withWidth(48).withHeight(14).translated(0, 14));
 
     vuMeter->setBounds(b.withTrimmedLeft(1048).withWidth(96).withHeight(28));
 }