From 4b178947984cc27062df83ac61cee2e9b76c6741 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 28 Sep 2024 09:29:15 -0400 Subject: [PATCH] Move to JUCE 8.0.2 So now conduit, surge, and shortcircuit all at same point --- libs/JUCE | 2 +- libs/sst/sst-clap-helpers | 2 +- libs/sst/sst-jucegui | 2 +- src-ui/CMakeLists.txt | 6 +++--- .../edit-screen/components/mapping-pane/VariantDisplay.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/JUCE b/libs/JUCE index 46c2a959..4ada2e1f 160000 --- a/libs/JUCE +++ b/libs/JUCE @@ -1 +1 @@ -Subproject commit 46c2a95905abffe41a7aa002c70fb30bd3b626ef +Subproject commit 4ada2e1f4db082f5dd803f249f37b3bf9c5f55ef diff --git a/libs/sst/sst-clap-helpers b/libs/sst/sst-clap-helpers index df6c1d8f..a1204b50 160000 --- a/libs/sst/sst-clap-helpers +++ b/libs/sst/sst-clap-helpers @@ -1 +1 @@ -Subproject commit df6c1d8fcd6656d7a96ee7080173333e56f8a312 +Subproject commit a1204b50a5b78dd87cbc8c3efafe0567c4295818 diff --git a/libs/sst/sst-jucegui b/libs/sst/sst-jucegui index 82f578b4..bfa96278 160000 --- a/libs/sst/sst-jucegui +++ b/libs/sst/sst-jucegui @@ -1 +1 @@ -Subproject commit 82f578b4b2eabb3f50112740f2df1f8e1781c2ae +Subproject commit bfa962785b720e786b9d88a4c1bcfd354ca585e8 diff --git a/src-ui/CMakeLists.txt b/src-ui/CMakeLists.txt index 3c1a99f2..0091696f 100644 --- a/src-ui/CMakeLists.txt +++ b/src-ui/CMakeLists.txt @@ -74,9 +74,9 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ) if (NOT CMAKE_UNITY_BUILD) - message(STATUS "Includeing Melatonin") - target_link_libraries(${PROJECT_NAME} PUBLIC melatonin_inspector) - target_compile_definitions(${PROJECT_NAME} PUBLIC HAS_MELATONIN_INSPECTOR=1) + #message(STATUS "Includeing Melatonin") + #target_link_libraries(${PROJECT_NAME} PUBLIC melatonin_inspector) + #target_compile_definitions(${PROJECT_NAME} PUBLIC HAS_MELATONIN_INSPECTOR=1) endif() target_compile_definitions(${PROJECT_NAME} PRIVATE diff --git a/src-ui/app/edit-screen/components/mapping-pane/VariantDisplay.cpp b/src-ui/app/edit-screen/components/mapping-pane/VariantDisplay.cpp index f171049e..d4514913 100644 --- a/src-ui/app/edit-screen/components/mapping-pane/VariantDisplay.cpp +++ b/src-ui/app/edit-screen/components/mapping-pane/VariantDisplay.cpp @@ -931,7 +931,7 @@ void VariantDisplay::FileInfos::paint(juce::Graphics &g) int margin{5}; auto ft = editor->themeApplier.interMediumFor(12); - auto w = ft.getStringWidthFloat(msg); + auto w = juce::GlyphArrangement::getStringWidth(ft, msg); auto bx = getLocalBounds().withWidth(w + 2 * margin).withHeight(18); g.setColour(editor->themeColor(theme::ColorMap::bg_3).withAlpha(0.5f)); g.fillRect(bx);