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

Allow the SFZ label to be clicked like a button

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-10-13 22:10:09 +02:00
parent c69c054f44
commit 5cd6a514ae
5 changed files with 75 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/layout/main.fl
View file

@ -56,8 +56,9 @@ widget_class mainView {open
} }
Fl_Box sfzFileLabel_ { Fl_Box sfzFileLabel_ {
label {DefaultInstrument.sfz} label {DefaultInstrument.sfz}
comment {tag=kTagLoadSfzFile} selected
xywh {195 11 250 31} labelsize 20 align 20 xywh {195 11 250 31} labelsize 20 align 20
class Label class ClickableLabel
} }
Fl_Box {} { Fl_Box {} {
label {Key switch:} label {Key switch:}
@ -80,7 +81,7 @@ widget_class mainView {open
class NextFileButton class NextFileButton
} }
Fl_Button fileOperationsMenu_ { Fl_Button fileOperationsMenu_ {
comment {tag=kTagFileOperations} selected comment {tag=kTagFileOperations}
xywh {530 14 25 25} labelsize 24 xywh {530 14 25 25} labelsize 24
class ChevronDropDown class ChevronDropDown
} }

52
editor/src/editor/Editor.cpp
View file

@ -66,9 +66,9 @@ struct Editor::Impl : EditorController::Receiver, IControlListener {
kTagLastChangePanel = kTagFirstChangePanel + kNumPanels - 1, kTagLastChangePanel = kTagFirstChangePanel + kNumPanels - 1,
}; };
CTextLabel* sfzFileLabel_ = nullptr; STextButton* sfzFileLabel_ = nullptr;
CTextLabel* scalaFileLabel_ = nullptr; CTextLabel* scalaFileLabel_ = nullptr;
CTextButton* scalaFileButton_ = nullptr; STextButton* scalaFileButton_ = nullptr;
CControl *volumeSlider_ = nullptr; CControl *volumeSlider_ = nullptr;
CTextLabel* volumeLabel_ = nullptr; CTextLabel* volumeLabel_ = nullptr;
SValueMenu *numVoicesSlider_ = nullptr; SValueMenu *numVoicesSlider_ = nullptr;
@ -122,7 +122,8 @@ struct Editor::Impl : EditorController::Receiver, IControlListener {
void updateSfzFileLabel(const std::string& filePath); void updateSfzFileLabel(const std::string& filePath);
void updateScalaFileLabel(const std::string& filePath); void updateScalaFileLabel(const std::string& filePath);
static void updateLabelWithFileName(CTextLabel* label, const std::string& filePath, absl::string_view removedSuffix); static void updateLabelWithFileName(CTextLabel* label, const std::string& filePath, absl::string_view removedSuffix);
static void updateButtonWithFileName(CTextButton* button, const std::string& filePath, absl::string_view removedSuffix); static void updateButtonWithFileName(STextButton* button, const std::string& filePath, absl::string_view removedSuffix);
static void updateSButtonWithFileName(STextButton* button, const std::string& filePath, absl::string_view removedSuffix);
void updateVolumeLabel(float volume); void updateVolumeLabel(float volume);
void updateNumVoicesLabel(int numVoices); void updateNumVoicesLabel(int numVoices);
void updateOversamplingLabel(int oversamplingLog2); void updateOversamplingLabel(int oversamplingLog2);
@ -329,6 +330,8 @@ void Editor::Impl::createFrameContents()
struct Theme { struct Theme {
CColor boxBackground; CColor boxBackground;
CColor text; CColor text;
CColor inactiveText;
CColor highlightedText;
CColor titleBoxText; CColor titleBoxText;
CColor titleBoxBackground; CColor titleBoxBackground;
CColor icon; CColor icon;
@ -343,6 +346,8 @@ void Editor::Impl::createFrameContents()
Theme lightTheme; Theme lightTheme;
lightTheme.boxBackground = { 0xba, 0xbd, 0xb6 }; lightTheme.boxBackground = { 0xba, 0xbd, 0xb6 };
lightTheme.text = { 0x00, 0x00, 0x00 }; lightTheme.text = { 0x00, 0x00, 0x00 };
lightTheme.inactiveText = { 0xb2, 0xb2, 0xb2 };
lightTheme.highlightedText = { 0xfd, 0x98, 0x00 };
lightTheme.titleBoxText = { 0xff, 0xff, 0xff }; lightTheme.titleBoxText = { 0xff, 0xff, 0xff };
lightTheme.titleBoxBackground = { 0x2e, 0x34, 0x36 }; lightTheme.titleBoxBackground = { 0x2e, 0x34, 0x36 };
lightTheme.icon = lightTheme.text; lightTheme.icon = lightTheme.text;
@ -355,6 +360,8 @@ void Editor::Impl::createFrameContents()
Theme darkTheme; Theme darkTheme;
darkTheme.boxBackground = { 0x2e, 0x34, 0x36 }; darkTheme.boxBackground = { 0x2e, 0x34, 0x36 };
darkTheme.text = { 0xff, 0xff, 0xff }; darkTheme.text = { 0xff, 0xff, 0xff };
darkTheme.inactiveText = { 0xb2, 0xb2, 0xb2 };
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 = darkTheme.text;
@ -384,7 +391,8 @@ void Editor::Impl::createFrameContents()
#if 0 #if 0
typedef CTextButton Button; typedef CTextButton Button;
#endif #endif
typedef CTextButton ValueButton; typedef STextButton ClickableLabel;
typedef STextButton ValueButton;
typedef STextButton LoadFileButton; typedef STextButton LoadFileButton;
typedef STextButton CCButton; typedef STextButton CCButton;
typedef STextButton HomeButton; typedef STextButton HomeButton;
@ -471,13 +479,31 @@ void Editor::Impl::createFrameContents()
return button; return button;
}; };
#endif #endif
auto createClickableLabel = [this, &theme](const CRect& bounds, int tag, const char* label, CHoriTxtAlign align, int fontsize) {
STextButton* button = new STextButton(bounds, this, tag, label);
auto font = owned(new CFontDesc("Roboto", fontsize));
button->setFont(font);
button->setTextAlignment(align);
button->setTextColor(theme->text);
button->setInactiveColor(theme->inactiveText);
button->setHoverColor(theme->highlightedText);
button->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00));
button->setFrameColorHighlighted(CColor(0x00, 0x00, 0x00, 0x00));
SharedPointer<CGradient> gradient = owned(CGradient::create(0.0, 1.0, CColor(0x00, 0x00, 0x00, 0x00), CColor(0x00, 0x00, 0x00, 0x00)));
button->setGradient(gradient);
button->setGradientHighlighted(gradient);
return button;
};
auto createValueButton = [this, &theme](const CRect& bounds, int tag, const char* label, CHoriTxtAlign align, int fontsize) { auto createValueButton = [this, &theme](const CRect& bounds, int tag, const char* label, CHoriTxtAlign align, int fontsize) {
CTextButton* button = new CTextButton(bounds, this, tag, label); STextButton* button = new STextButton(bounds, this, tag, label);
auto font = owned(new CFontDesc("Roboto", fontsize)); auto font = owned(new CFontDesc("Roboto", fontsize));
button->setFont(font); button->setFont(font);
button->setTextAlignment(align); button->setTextAlignment(align);
button->setTextColor(theme->valueText); button->setTextColor(theme->valueText);
button->setInactiveColor(theme->inactiveText);
button->setHoverColor(theme->highlightedText);
button->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00)); button->setFrameColor(CColor(0x00, 0x00, 0x00, 0x00));
button->setFrameColorHighlighted(CColor(0x00, 0x00, 0x00, 0x00));
SharedPointer<CGradient> gradient = owned(CGradient::create(0.0, 1.0, theme->valueBackground, theme->valueBackground)); SharedPointer<CGradient> gradient = owned(CGradient::create(0.0, 1.0, theme->valueBackground, theme->valueBackground));
button->setGradient(gradient); button->setGradient(gradient);
button->setGradientHighlighted(gradient); button->setGradientHighlighted(gradient);
@ -501,6 +527,7 @@ void Editor::Impl::createFrameContents()
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));
btn->setFrameColorHighlighted(CColor(0x00, 0x00, 0x00, 0x00));
btn->setGradient(nullptr); btn->setGradient(nullptr);
btn->setGradientHighlighted(nullptr); btn->setGradientHighlighted(nullptr);
return btn; return btn;
@ -834,7 +861,7 @@ absl::string_view Editor::Impl::simplifiedFileName(absl::string_view path, absl:
void Editor::Impl::updateSfzFileLabel(const std::string& filePath) void Editor::Impl::updateSfzFileLabel(const std::string& filePath)
{ {
updateLabelWithFileName(sfzFileLabel_, filePath, ".sfz"); updateButtonWithFileName(sfzFileLabel_, filePath, ".sfz");
} }
void Editor::Impl::updateScalaFileLabel(const std::string& filePath) void Editor::Impl::updateScalaFileLabel(const std::string& filePath)
@ -852,13 +879,20 @@ void Editor::Impl::updateLabelWithFileName(CTextLabel* label, const std::string&
label->setText(fileName.c_str()); label->setText(fileName.c_str());
} }
void Editor::Impl::updateButtonWithFileName(CTextButton* button, const std::string& filePath, absl::string_view removedSuffix) void Editor::Impl::updateButtonWithFileName(STextButton* button, const std::string& filePath, absl::string_view removedSuffix)
{ {
if (!button) if (!button)
return; return;
std::string fileName = std::string(simplifiedFileName(filePath, removedSuffix, "<No file>")); std::string fileName = std::string(simplifiedFileName(filePath, removedSuffix, {}));
button->setTitle(fileName.c_str()); if (!fileName.empty()) {
button->setTitle(fileName.c_str());
button->setInactive(false);
}
else {
button->setTitle("No file");
button->setInactive(true);
}
} }
void Editor::Impl::updateVolumeLabel(float volume) void Editor::Impl::updateVolumeLabel(float volume)

28
editor/src/editor/GUIComponents.cpp
View file

@ -452,6 +452,7 @@ void SActionMenu::setTitle(std::string title)
void SActionMenu::setHoverColor(const CColor& color) void SActionMenu::setHoverColor(const CColor& color)
{ {
hoverColor_ = color; hoverColor_ = color;
invalid();
} }
CMenuItem* SActionMenu::addEntry(CMenuItem* item, int32_t tag, int32_t index) CMenuItem* SActionMenu::addEntry(CMenuItem* item, int32_t tag, int32_t index)
@ -554,33 +555,46 @@ void SActionMenu::onItemClicked(int32_t index)
} }
/// ///
void STextButton::setHoverColor (const CColor& color) void STextButton::setHoverColor(const CColor& color)
{ {
hoverColor_ = color; hoverColor_ = color;
invalid();
}
void STextButton::setInactiveColor(const CColor& color)
{
inactiveColor_ = color;
invalid();
}
void STextButton::setInactive(bool b)
{
inactive_ = b;
invalid();
} }
void STextButton::draw(CDrawContext* context) void STextButton::draw(CDrawContext* context)
{ {
CColor backupColor = textColor; CColor backupColor = textColor;
if (hovered) { if (hovered_)
textColor = hoverColor_; // textColor is protected textColor = hoverColor_; // textColor is protected
} else if (inactive_)
textColor = inactiveColor_;
CTextButton::draw(context); CTextButton::draw(context);
if (hovered) textColor = backupColor;
textColor = backupColor;
} }
CMouseEventResult STextButton::onMouseEntered (CPoint& where, const CButtonState& buttons) CMouseEventResult STextButton::onMouseEntered (CPoint& where, const CButtonState& buttons)
{ {
hovered = true; hovered_ = true;
invalid(); invalid();
return CTextButton::onMouseEntered(where, buttons); return CTextButton::onMouseEntered(where, buttons);
} }
CMouseEventResult STextButton::onMouseExited (CPoint& where, const CButtonState& buttons) CMouseEventResult STextButton::onMouseExited (CPoint& where, const CButtonState& buttons)
{ {
hovered = false; hovered_ = false;
invalid(); invalid();
return CTextButton::onMouseExited(where, buttons); return CTextButton::onMouseExited(where, buttons);
} }

8
editor/src/editor/GUIComponents.h
View file

@ -203,12 +203,18 @@ public:
CColor getHoverColor() const { return hoverColor_; } CColor getHoverColor() const { return hoverColor_; }
void setHoverColor(const CColor& color); void setHoverColor(const CColor& color);
CColor getInactiveColor() const { return inactiveColor_; }
void setInactiveColor(const CColor& color);
bool isInactive() const { return inactive_; }
void setInactive(bool b);
CMouseEventResult onMouseEntered (CPoint& where, const CButtonState& buttons) override; CMouseEventResult onMouseEntered (CPoint& where, const CButtonState& buttons) override;
CMouseEventResult onMouseExited (CPoint& where, const CButtonState& buttons) override; CMouseEventResult onMouseExited (CPoint& where, const CButtonState& buttons) override;
void draw(CDrawContext* context) override; void draw(CDrawContext* context) override;
private: private:
CColor hoverColor_; CColor hoverColor_;
bool hovered { false }; bool hovered_ { false };
CColor inactiveColor_;
bool inactive_ { false };
}; };
/// ///

2
editor/src/editor/layout/main.hpp
View file

@ -22,7 +22,7 @@ HLine* const view__9 = createHLine(CRect(10, 36, 370, 41), -1, "", kCenterText,
view__8->addView(view__9); view__8->addView(view__9);
HLine* const view__10 = createHLine(CRect(10, 68, 370, 73), -1, "", kCenterText, 14); HLine* const view__10 = createHLine(CRect(10, 68, 370, 73), -1, "", kCenterText, 14);
view__8->addView(view__10); view__8->addView(view__10);
Label* const view__11 = createLabel(CRect(10, 6, 260, 37), -1, "DefaultInstrument.sfz", kLeftText, 20); ClickableLabel* const view__11 = createClickableLabel(CRect(10, 6, 260, 37), kTagLoadSfzFile, "DefaultInstrument.sfz", kLeftText, 20);
sfzFileLabel_ = view__11; sfzFileLabel_ = view__11;
view__8->addView(view__11); view__8->addView(view__11);
Label* const view__12 = createLabel(CRect(10, 39, 260, 69), -1, "Key switch:", kLeftText, 20); Label* const view__12 = createLabel(CRect(10, 39, 260, 69), -1, "Key switch:", kLeftText, 20);