diff --git a/plugins/editor/CMakeLists.txt b/plugins/editor/CMakeLists.txt index f7c8904e3..387f4704d 100644 --- a/plugins/editor/CMakeLists.txt +++ b/plugins/editor/CMakeLists.txt @@ -5,8 +5,10 @@ set(EDITOR_RESOURCES logo.png logo_text.png logo_text_white.png + logo_text_shaded.png logo_text@2x.png logo_text_white@2x.png + logo_text_shaded@2x.png background.png background@2x.png icon_white.png @@ -14,6 +16,7 @@ set(EDITOR_RESOURCES knob48.png knob48@2x.png Fonts/sfizz-fluentui-system-r20.ttf + Fonts/sfizz-fluentui-system-f20.ttf Fonts/Roboto-Regular.ttf PARENT_SCOPE) diff --git a/plugins/editor/layout/main.fl b/plugins/editor/layout/main.fl index ba35eb567..d1e5a1abb 100644 --- a/plugins/editor/layout/main.fl +++ b/plugins/editor/layout/main.fl @@ -20,23 +20,23 @@ widget_class mainView {open class RoundedGroup } { Fl_Box {} { - comment {tag=kTagFirstChangePanel+kPanelGeneral} - image {../resources/logo_text_white.png} xywh {35 9 120 60} + comment {tag=kTagFirstChangePanel+kPanelGeneral} selected + image {../resources/logo_text_shaded.png} xywh {35 9 120 60} class SfizzMainButton } Fl_Button {} { - comment {tag=kTagFirstChangePanel+kPanelGeneral} selected - xywh {49 77 25 25} labelsize 24 + comment {tag=kTagFirstChangePanel+kPanelGeneral} + xywh {36 73 32 32} labelsize 30 class HomeButton } Fl_Button {} { - comment {tag=kTagFirstChangePanel+kPanelControls} selected - xywh {81 77 25 25} labelsize 24 + comment {tag=kTagFirstChangePanel+kPanelControls} + xywh {76 73 32 32} labelsize 30 class CCButton } Fl_Button {} { - comment {tag=kTagFirstChangePanel+kPanelSettings} selected - xywh {112 77 25 25} labelsize 24 + comment {tag=kTagFirstChangePanel+kPanelSettings} + xywh {116 73 32 32} labelsize 30 class SettingsButton } } diff --git a/plugins/editor/resources/Fonts/sfizz-fluentui-system-f20.ttf b/plugins/editor/resources/Fonts/sfizz-fluentui-system-f20.ttf new file mode 100644 index 000000000..691a6dacc Binary files /dev/null and b/plugins/editor/resources/Fonts/sfizz-fluentui-system-f20.ttf differ diff --git a/plugins/editor/resources/logo_text_shaded.png b/plugins/editor/resources/logo_text_shaded.png new file mode 100644 index 000000000..e4198b1cc Binary files /dev/null and b/plugins/editor/resources/logo_text_shaded.png differ diff --git a/plugins/editor/resources/logo_text_shaded@2x.png b/plugins/editor/resources/logo_text_shaded@2x.png new file mode 100644 index 000000000..b786d9b98 Binary files /dev/null and b/plugins/editor/resources/logo_text_shaded@2x.png differ diff --git a/plugins/editor/src/editor/Editor.cpp b/plugins/editor/src/editor/Editor.cpp index 51049ac1e..e721a0ee9 100644 --- a/plugins/editor/src/editor/Editor.cpp +++ b/plugins/editor/src/editor/Editor.cpp @@ -558,7 +558,7 @@ void Editor::Impl::createFrameContents() { CViewContainer* mainView; - SharedPointer iconWhite = owned(new CBitmap("logo_text_white.png")); + SharedPointer iconShaded = owned(new CBitmap("logo_text_shaded.png")); SharedPointer background = owned(new CBitmap("background.png")); SharedPointer knob48 = owned(new CBitmap("knob48.png")); SharedPointer logoText = owned(new CBitmap("logo_text.png")); @@ -603,7 +603,7 @@ void Editor::Impl::createFrameContents() darkTheme.highlightedText = { 0xfd, 0x98, 0x00 }; darkTheme.titleBoxText = { 0x00, 0x00, 0x00 }; darkTheme.titleBoxBackground = { 0xba, 0xbd, 0xb6 }; - darkTheme.icon = darkTheme.text; + darkTheme.icon = { 0xb2, 0xb2, 0xb2 }; darkTheme.iconHighlight = { 0xfd, 0x98, 0x00 }; darkTheme.valueText = { 0x00, 0x00, 0x00 }; darkTheme.valueBackground = { 0x9a, 0x9a, 0x9a }; @@ -636,8 +636,8 @@ void Editor::Impl::createFrameContents() box->setTitleFont(font); return box; }; - auto createSfizzMainButton = [this, &iconWhite](const CRect& bounds, int tag, const char*, CHoriTxtAlign, int) { - return new CKickButton(bounds, this, tag, iconWhite); + auto createSfizzMainButton = [this, &iconShaded](const CRect& bounds, int tag, const char*, CHoriTxtAlign, int) { + return new CKickButton(bounds, this, tag, iconShaded); }; auto createLabel = [&theme](const CRect& bounds, int, const char* label, CHoriTxtAlign align, int fontsize) { CTextLabel* lbl = new CTextLabel(bounds, label); @@ -757,7 +757,7 @@ void Editor::Impl::createFrameContents() }; auto createGlyphButton = [this, &theme](UTF8StringPtr glyph, const CRect& bounds, int tag, int fontsize) { STextButton* btn = new STextButton(bounds, this, tag, glyph); - btn->setFont(makeOwned("Sfizz Fluent System R20", fontsize)); + btn->setFont(makeOwned("Sfizz Fluent System F20", fontsize)); btn->setTextColor(theme->icon); btn->setHoverColor(theme->iconHighlight); btn->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00)); @@ -792,7 +792,7 @@ void Editor::Impl::createFrameContents() }; auto createResetSomethingButton = [&createValueButton](const CRect& bounds, int tag, const char*, CHoriTxtAlign, int fontsize) { STextButton* btn = createValueButton(bounds, tag, u8"\ue13a", kCenterText, fontsize); - btn->setFont(makeOwned("Sfizz Fluent System R20", fontsize)); + btn->setFont(makeOwned("Sfizz Fluent System F20", fontsize)); return btn; }; auto createPiano = [](const CRect& bounds, int, const char*, CHoriTxtAlign, int fontsize) { @@ -804,7 +804,7 @@ void Editor::Impl::createFrameContents() auto createChevronDropDown = [this, &theme](const CRect& bounds, int, const char*, CHoriTxtAlign, int fontsize) { SActionMenu* menu = new SActionMenu(bounds, this); menu->setTitle(u8"\ue0d7"); - menu->setFont(makeOwned("Sfizz Fluent System R20", fontsize)); + menu->setFont(makeOwned("Sfizz Fluent System F20", fontsize)); menu->setFontColor(theme->icon); menu->setHoverColor(theme->iconHighlight); menu->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00)); @@ -817,7 +817,7 @@ void Editor::Impl::createFrameContents() result = u8"\ue0d7"; return true; }); - menu->setFont(makeOwned("Sfizz Fluent System R20", fontsize)); + menu->setFont(makeOwned("Sfizz Fluent System F20", fontsize)); menu->setFontColor(theme->icon); menu->setHoverColor(theme->iconHighlight); menu->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00)); diff --git a/plugins/editor/src/editor/layout/main.hpp b/plugins/editor/src/editor/layout/main.hpp index c5d7c57b9..626d093ee 100644 --- a/plugins/editor/src/editor/layout/main.hpp +++ b/plugins/editor/src/editor/layout/main.hpp @@ -10,11 +10,11 @@ auto* const view__3 = createRoundedGroup(CRect(5, 4, 180, 105), -1, "", kCenterT view__2->addView(view__3); auto* const view__4 = createSfizzMainButton(CRect(30, 5, 150, 65), kTagFirstChangePanel+kPanelGeneral, "", kCenterText, 14); view__3->addView(view__4); -auto* const view__5 = createHomeButton(CRect(44, 73, 69, 98), kTagFirstChangePanel+kPanelGeneral, "", kCenterText, 24); +auto* const view__5 = createHomeButton(CRect(31, 69, 63, 101), kTagFirstChangePanel+kPanelGeneral, "", kCenterText, 30); view__3->addView(view__5); -auto* const view__6 = createCCButton(CRect(76, 73, 101, 98), kTagFirstChangePanel+kPanelControls, "", kCenterText, 24); +auto* const view__6 = createCCButton(CRect(71, 69, 103, 101), kTagFirstChangePanel+kPanelControls, "", kCenterText, 30); view__3->addView(view__6); -auto* const view__7 = createSettingsButton(CRect(107, 73, 132, 98), kTagFirstChangePanel+kPanelSettings, "", kCenterText, 24); +auto* const view__7 = createSettingsButton(CRect(111, 69, 143, 101), kTagFirstChangePanel+kPanelSettings, "", kCenterText, 30); view__3->addView(view__7); auto* const view__8 = createRoundedGroup(CRect(185, 5, 565, 105), -1, "", kCenterText, 14); view__2->addView(view__8); diff --git a/scripts/generate_ui_fonts.sh b/scripts/generate_ui_fonts.sh index 8b0f48f27..9cb1555c2 100755 --- a/scripts/generate_ui_fonts.sh +++ b/scripts/generate_ui_fonts.sh @@ -7,17 +7,19 @@ if ! test -d "src"; then fi root="`pwd`" -fonts="$root/editor/resources/Fonts" +fonts="$root/plugins/editor/resources/Fonts" -if test ! -d editor/external/fluentui-system-icons; then - cd editor/external +if test ! -d plugins/editor/external/fluentui-system-icons; then + cd plugins/editor/external git clone https://github.com/sfztools/fluentui-system-icons.git cd fluentui-system-icons else - cd editor/external/fluentui-system-icons + cd plugins/editor/external/fluentui-system-icons git checkout master git pull origin master fi ./generate_icons_font.py -s regular -w 20 -n 'Sfizz Fluent System R20' \ -o "$fonts/sfizz-fluentui-system-r20.ttf" +./generate_icons_font.py -s filled -w 20 -n 'Sfizz Fluent System F20' \ + -o "$fonts/sfizz-fluentui-system-f20.ttf" diff --git a/scripts/innosetup.iss.in b/scripts/innosetup.iss.in index 3586f7d32..70dc76d88 100644 --- a/scripts/innosetup.iss.in +++ b/scripts/innosetup.iss.in @@ -63,6 +63,7 @@ Source: "sfizz.vst3\Plugin.ico"; Components: vst3; DestDir: "{commoncf}\VST3\sfi Source: "sfizz.vst3\gpl-3.0.txt"; Components: main; DestDir: "{app}" ; Note(sfizz): OS older than Windows 10 require UI fonts to be installed system-wide Source: "sfizz.vst3\Contents\Resources\Fonts\sfizz-fluentui-system-r20.ttf"; DestDir: "{fonts}"; FontInstall: "Sfizz Fluent System R20"; Flags: uninsneveruninstall; OnlyBelowVersion: 6.4 +Source: "sfizz.vst3\Contents\Resources\Fonts\sfizz-fluentui-system-f20.ttf"; DestDir: "{fonts}"; FontInstall: "Sfizz Fluent System F20"; Flags: uninsneveruninstall; OnlyBelowVersion: 6.4 Source: "sfizz.vst3\Contents\Resources\Fonts\Roboto-Regular.ttf"; DestDir: "{fonts}"; FontInstall: "Roboto Regular"; Flags: uninsneveruninstall; OnlyBelowVersion: 6.4 ;Source: "setup\vc_redist.x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall ; NOTE: Don't use "Flags: ignoreversion" on any shared system files