From 5fe2be5facdf61569461e2d9f8551713a3215e7c Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Sat, 27 Feb 2021 13:37:03 +0100 Subject: [PATCH] Editor logo in shaded style --- plugins/editor/CMakeLists.txt | 2 ++ plugins/editor/layout/main.fl | 10 +++++----- plugins/editor/resources/logo_text_shaded.png | Bin 0 -> 2471 bytes plugins/editor/resources/logo_text_shaded@2x.png | Bin 0 -> 4726 bytes plugins/editor/src/editor/Editor.cpp | 6 +++--- 5 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 plugins/editor/resources/logo_text_shaded.png create mode 100644 plugins/editor/resources/logo_text_shaded@2x.png diff --git a/plugins/editor/CMakeLists.txt b/plugins/editor/CMakeLists.txt index bfc5cc1e..387f4704 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 diff --git a/plugins/editor/layout/main.fl b/plugins/editor/layout/main.fl index 74582ec2..d1e5a1ab 100644 --- a/plugins/editor/layout/main.fl +++ b/plugins/editor/layout/main.fl @@ -20,22 +20,22 @@ 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 + comment {tag=kTagFirstChangePanel+kPanelGeneral} xywh {36 73 32 32} labelsize 30 class HomeButton } Fl_Button {} { - comment {tag=kTagFirstChangePanel+kPanelControls} selected + comment {tag=kTagFirstChangePanel+kPanelControls} xywh {76 73 32 32} labelsize 30 class CCButton } Fl_Button {} { - comment {tag=kTagFirstChangePanel+kPanelSettings} selected + comment {tag=kTagFirstChangePanel+kPanelSettings} xywh {116 73 32 32} labelsize 30 class SettingsButton } diff --git a/plugins/editor/resources/logo_text_shaded.png b/plugins/editor/resources/logo_text_shaded.png new file mode 100644 index 0000000000000000000000000000000000000000..e4198b1ccf3640a5aac223e32de00cb9e9e67ca7 GIT binary patch literal 2471 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 Ef@g2{CIA2c literal 0 HcmV?d00001 diff --git a/plugins/editor/src/editor/Editor.cpp b/plugins/editor/src/editor/Editor.cpp index 76e08b71..e721a0ee 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")); @@ -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);