sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Icons in filled style

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-02-27 13:22:52 +01:00
parent c88e55190f
commit 8e122e3a36
7 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/editor/CMakeLists.txt
View file

@ -14,6 +14,7 @@ set(EDITOR_RESOURCES
knob48.png knob48.png
knob48@2x.png knob48@2x.png
Fonts/sfizz-fluentui-system-r20.ttf Fonts/sfizz-fluentui-system-r20.ttf
Fonts/sfizz-fluentui-system-f20.ttf
Fonts/Roboto-Regular.ttf Fonts/Roboto-Regular.ttf
PARENT_SCOPE) PARENT_SCOPE)

6
plugins/editor/layout/main.fl
View file

@ -26,17 +26,17 @@ widget_class mainView {open
} }
Fl_Button {} { Fl_Button {} {
comment {tag=kTagFirstChangePanel+kPanelGeneral} selected comment {tag=kTagFirstChangePanel+kPanelGeneral} selected
xywh {49 77 25 25} labelsize 24 xywh {36 73 32 32} labelsize 30
class HomeButton class HomeButton
} }
Fl_Button {} { Fl_Button {} {
comment {tag=kTagFirstChangePanel+kPanelControls} selected comment {tag=kTagFirstChangePanel+kPanelControls} selected
xywh {81 77 25 25} labelsize 24 xywh {76 73 32 32} labelsize 30
class CCButton class CCButton
} }
Fl_Button {} { Fl_Button {} {
comment {tag=kTagFirstChangePanel+kPanelSettings} selected comment {tag=kTagFirstChangePanel+kPanelSettings} selected
xywh {112 77 25 25} labelsize 24 xywh {116 73 32 32} labelsize 30
class SettingsButton class SettingsButton
} }
} }

BIN
plugins/editor/resources/Fonts/sfizz-fluentui-system-f20.ttf Normal file
View file

Binary file not shown.

10
plugins/editor/src/editor/Editor.cpp
View file

@ -603,7 +603,7 @@ void Editor::Impl::createFrameContents()
darkTheme.highlightedText = { 0xfd, 0x98, 0x00 }; darkTheme.highlightedText = { 0xfd, 0x98, 0x00 };
darkTheme.titleBoxText = { 0x00, 0x00, 0x00 }; darkTheme.titleBoxText = { 0x00, 0x00, 0x00 };
darkTheme.titleBoxBackground = { 0xba, 0xbd, 0xb6 }; darkTheme.titleBoxBackground = { 0xba, 0xbd, 0xb6 };
darkTheme.icon = darkTheme.text; darkTheme.icon = { 0xb2, 0xb2, 0xb2 };
darkTheme.iconHighlight = { 0xfd, 0x98, 0x00 }; darkTheme.iconHighlight = { 0xfd, 0x98, 0x00 };
darkTheme.valueText = { 0x00, 0x00, 0x00 }; darkTheme.valueText = { 0x00, 0x00, 0x00 };
darkTheme.valueBackground = { 0x9a, 0x9a, 0x9a }; darkTheme.valueBackground = { 0x9a, 0x9a, 0x9a };
@ -757,7 +757,7 @@ void Editor::Impl::createFrameContents()
}; };
auto createGlyphButton = [this, &theme](UTF8StringPtr glyph, const CRect& bounds, int tag, int fontsize) { auto createGlyphButton = [this, &theme](UTF8StringPtr glyph, const CRect& bounds, int tag, int fontsize) {
STextButton* btn = new STextButton(bounds, this, tag, glyph); STextButton* btn = new STextButton(bounds, this, tag, glyph);
btn->setFont(makeOwned<CFontDesc>("Sfizz Fluent System R20", fontsize)); btn->setFont(makeOwned<CFontDesc>("Sfizz Fluent System F20", fontsize));
btn->setTextColor(theme->icon); btn->setTextColor(theme->icon);
btn->setHoverColor(theme->iconHighlight); btn->setHoverColor(theme->iconHighlight);
btn->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00)); 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) { auto createResetSomethingButton = [&createValueButton](const CRect& bounds, int tag, const char*, CHoriTxtAlign, int fontsize) {
STextButton* btn = createValueButton(bounds, tag, u8"\ue13a", kCenterText, fontsize); STextButton* btn = createValueButton(bounds, tag, u8"\ue13a", kCenterText, fontsize);
btn->setFont(makeOwned<CFontDesc>("Sfizz Fluent System R20", fontsize)); btn->setFont(makeOwned<CFontDesc>("Sfizz Fluent System F20", fontsize));
return btn; return btn;
}; };
auto createPiano = [](const CRect& bounds, int, const char*, CHoriTxtAlign, int fontsize) { 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) { auto createChevronDropDown = [this, &theme](const CRect& bounds, int, const char*, CHoriTxtAlign, int fontsize) {
SActionMenu* menu = new SActionMenu(bounds, this); SActionMenu* menu = new SActionMenu(bounds, this);
menu->setTitle(u8"\ue0d7"); menu->setTitle(u8"\ue0d7");
menu->setFont(makeOwned<CFontDesc>("Sfizz Fluent System R20", fontsize)); menu->setFont(makeOwned<CFontDesc>("Sfizz Fluent System F20", fontsize));
menu->setFontColor(theme->icon); menu->setFontColor(theme->icon);
menu->setHoverColor(theme->iconHighlight); menu->setHoverColor(theme->iconHighlight);
menu->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00)); menu->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00));
@ -817,7 +817,7 @@ void Editor::Impl::createFrameContents()
result = u8"\ue0d7"; result = u8"\ue0d7";
return true; return true;
}); });
menu->setFont(makeOwned<CFontDesc>("Sfizz Fluent System R20", fontsize)); menu->setFont(makeOwned<CFontDesc>("Sfizz Fluent System F20", fontsize));
menu->setFontColor(theme->icon); menu->setFontColor(theme->icon);
menu->setHoverColor(theme->iconHighlight); menu->setHoverColor(theme->iconHighlight);
menu->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00)); menu->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00));

6
plugins/editor/src/editor/layout/main.hpp
View file

@ -10,11 +10,11 @@ auto* const view__3 = createRoundedGroup(CRect(5, 4, 180, 105), -1, "", kCenterT
view__2->addView(view__3); view__2->addView(view__3);
auto* const view__4 = createSfizzMainButton(CRect(30, 5, 150, 65), kTagFirstChangePanel+kPanelGeneral, "", kCenterText, 14); auto* const view__4 = createSfizzMainButton(CRect(30, 5, 150, 65), kTagFirstChangePanel+kPanelGeneral, "", kCenterText, 14);
view__3->addView(view__4); 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); 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); 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); view__3->addView(view__7);
auto* const view__8 = createRoundedGroup(CRect(185, 5, 565, 105), -1, "", kCenterText, 14); auto* const view__8 = createRoundedGroup(CRect(185, 5, 565, 105), -1, "", kCenterText, 14);
view__2->addView(view__8); view__2->addView(view__8);

10
scripts/generate_ui_fonts.sh
View file

@ -7,17 +7,19 @@ if ! test -d "src"; then
fi fi
root="`pwd`" root="`pwd`"
fonts="$root/editor/resources/Fonts" fonts="$root/plugins/editor/resources/Fonts"
if test ! -d editor/external/fluentui-system-icons; then if test ! -d plugins/editor/external/fluentui-system-icons; then
cd editor/external cd plugins/editor/external
git clone https://github.com/sfztools/fluentui-system-icons.git git clone https://github.com/sfztools/fluentui-system-icons.git
cd fluentui-system-icons cd fluentui-system-icons
else else
cd editor/external/fluentui-system-icons cd plugins/editor/external/fluentui-system-icons
git checkout master git checkout master
git pull origin master git pull origin master
fi fi
./generate_icons_font.py -s regular -w 20 -n 'Sfizz Fluent System R20' \ ./generate_icons_font.py -s regular -w 20 -n 'Sfizz Fluent System R20' \
-o "$fonts/sfizz-fluentui-system-r20.ttf" -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"

1
scripts/innosetup.iss.in
View file

@ -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}" 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 ; 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-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: "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 ;Source: "setup\vc_redist.x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; NOTE: Don't use "Flags: ignoreversion" on any shared system files