Skip to content

Commit

Permalink
Merge pull request #492 from jpcima/ui-refresh
Browse files Browse the repository at this point in the history 
Prevent the editor from refreshing constantly
  • Loading branch information
@jpcima
jpcima authored Oct 12, 2020
2 parents 728e2ca + e2dc18d commit dd0b4f3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 44 deletions.
41 changes: 8 additions & 33 deletions editor/src/editor/Editor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,20 +183,16 @@ void Editor::Impl::uiReceiveValue(EditId id, const EditValue& v)
case EditId::Volume:
{
const float value = v.to_float();
if (volumeSlider_) {
if (volumeSlider_)
volumeSlider_->setValue(value);
volumeSlider_->setDirty();
}
updateVolumeLabel(value);
}
break;
case EditId::Polyphony:
{
const int value = static_cast<int>(v.to_float());
if (numVoicesSlider_) {
if (numVoicesSlider_)
numVoicesSlider_->setValue(value);
numVoicesSlider_->setDirty();
}
updateNumVoicesLabel(value);
}
break;
Expand All @@ -208,20 +204,16 @@ void Editor::Impl::uiReceiveValue(EditId id, const EditValue& v)
for (int f = value; f > 1; f /= 2)
++log2Value;

if (oversamplingSlider_) {
if (oversamplingSlider_)
oversamplingSlider_->setValue(log2Value);
oversamplingSlider_->setDirty();
}
updateOversamplingLabel(log2Value);
}
break;
case EditId::PreloadSize:
{
const int value = static_cast<int>(v.to_float());
if (preloadSizeSlider_) {
if (preloadSizeSlider_)
preloadSizeSlider_->setValue(value);
preloadSizeSlider_->setDirty();
}
updatePreloadSizeLabel(value);
}
break;
Expand All @@ -235,34 +227,26 @@ void Editor::Impl::uiReceiveValue(EditId id, const EditValue& v)
case EditId::ScalaRootKey:
{
const int value = std::max(0, static_cast<int>(v.to_float()));
if (scalaRootKeySlider_) {
if (scalaRootKeySlider_)
scalaRootKeySlider_->setValue(value % 12);
scalaRootKeySlider_->setDirty();
}
if (scalaRootOctaveSlider_) {
if (scalaRootOctaveSlider_)
scalaRootOctaveSlider_->setValue(value / 12);
scalaRootOctaveSlider_->setDirty();
}
updateScalaRootKeyLabel(value);
}
break;
case EditId::TuningFrequency:
{
const float value = v.to_float();
if (tuningFrequencySlider_) {
if (tuningFrequencySlider_)
tuningFrequencySlider_->setValue(value);
tuningFrequencySlider_->setDirty();
}
updateTuningFrequencyLabel(value);
}
break;
case EditId::StretchTuning:
{
const float value = v.to_float();
if (stretchedTuningSlider_) {
if (stretchedTuningSlider_)
stretchedTuningSlider_->setValue(value);
stretchedTuningSlider_->setDirty();
}
updateStretchedTuningLabel(value);
}
break;
Expand Down Expand Up @@ -746,7 +730,6 @@ void Editor::Impl::updateLabelWithFileName(CTextLabel* label, const std::string&

std::string fileName = std::string(simplifiedFileName(filePath, removedSuffix, "<No file>"));
label->setText(fileName.c_str());
label->setDirty();
}

void Editor::Impl::updateButtonWithFileName(CTextButton* button, const std::string& filePath, absl::string_view removedSuffix)
Expand All @@ -756,7 +739,6 @@ void Editor::Impl::updateButtonWithFileName(CTextButton* button, const std::stri

std::string fileName = std::string(simplifiedFileName(filePath, removedSuffix, "<No file>"));
button->setTitle(fileName.c_str());
button->setDirty();
}

void Editor::Impl::updateVolumeLabel(float volume)
Expand All @@ -769,7 +751,6 @@ void Editor::Impl::updateVolumeLabel(float volume)
sprintf(text, "%.1f dB", volume);
text[sizeof(text) - 1] = '\0';
label->setText(text);
label->setDirty();
}

void Editor::Impl::updateNumVoicesLabel(int numVoices)
Expand All @@ -782,7 +763,6 @@ void Editor::Impl::updateNumVoicesLabel(int numVoices)
sprintf(text, "%d", numVoices);
text[sizeof(text) - 1] = '\0';
label->setText(text);
label->setDirty();
}

void Editor::Impl::updateOversamplingLabel(int oversamplingLog2)
Expand All @@ -795,7 +775,6 @@ void Editor::Impl::updateOversamplingLabel(int oversamplingLog2)
sprintf(text, "%dx", 1 << oversamplingLog2);
text[sizeof(text) - 1] = '\0';
label->setText(text);
label->setDirty();
}

void Editor::Impl::updatePreloadSizeLabel(int preloadSize)
Expand All @@ -808,7 +787,6 @@ void Editor::Impl::updatePreloadSizeLabel(int preloadSize)
sprintf(text, "%d kB", static_cast<int>(std::round(preloadSize * (1.0 / 1024))));
text[sizeof(text) - 1] = '\0';
label->setText(text);
label->setDirty();
}

void Editor::Impl::updateScalaRootKeyLabel(int rootKey)
Expand Down Expand Up @@ -837,7 +815,6 @@ void Editor::Impl::updateScalaRootKeyLabel(int rootKey)
};

label->setText(noteName(rootKey));
label->setDirty();
}

void Editor::Impl::updateTuningFrequencyLabel(float tuningFrequency)
Expand All @@ -850,7 +827,6 @@ void Editor::Impl::updateTuningFrequencyLabel(float tuningFrequency)
sprintf(text, "%.1f", tuningFrequency);
text[sizeof(text) - 1] = '\0';
label->setText(text);
label->setDirty();
}

void Editor::Impl::updateStretchedTuningLabel(float stretchedTuning)
Expand All @@ -863,7 +839,6 @@ void Editor::Impl::updateStretchedTuningLabel(float stretchedTuning)
sprintf(text, "%.3f", stretchedTuning);
text[sizeof(text) - 1] = '\0';
label->setText(text);
label->setDirty();
}

void Editor::Impl::setActivePanel(unsigned panelId)
Expand Down
22 changes: 11 additions & 11 deletions editor/src/editor/GUIComponents.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ SBoxContainer::SBoxContainer(const CRect& size)
void SBoxContainer::setCornerRadius(CCoord radius)
{
cornerRadius_ = radius;
setDirty();
invalid();
}

void SBoxContainer::setBackgroundColor(const CColor& color)
{
backgroundColor_ = color;
setDirty();
invalid();
}

CColor SBoxContainer::getBackgroundColor() const
Expand Down Expand Up @@ -62,19 +62,19 @@ STitleContainer::STitleContainer(const CRect& size, UTF8StringPtr text)
void STitleContainer::setTitleFont(CFontRef font)
{
titleFont_ = font;
setDirty();
invalid();
}

void STitleContainer::setTitleFontColor(CColor color)
{
titleFontColor_ = color;
setDirty();
invalid();
}

void STitleContainer::setTitleBackgroundColor(CColor color)
{
titleBackgroundColor_ = color;
setDirty();
invalid();
}

void STitleContainer::drawRect(CDrawContext* dc, const CRect& updateRect)
Expand Down Expand Up @@ -163,7 +163,7 @@ SPiano::SPiano(const CRect& bounds)
void SPiano::setFont(CFontRef font)
{
font_ = font;
setDirty();
invalid();
}

void SPiano::clearKeyRanges()
Expand Down Expand Up @@ -450,14 +450,14 @@ void STextButton::draw(CDrawContext* context)
CMouseEventResult STextButton::onMouseEntered (CPoint& where, const CButtonState& buttons)
{
hovered = true;
setDirty();
invalid();
return CTextButton::onMouseEntered(where, buttons);
}

CMouseEventResult STextButton::onMouseExited (CPoint& where, const CButtonState& buttons)
{
hovered = false;
setDirty();
invalid();
return CTextButton::onMouseExited(where, buttons);
}

Expand All @@ -472,23 +472,23 @@ void SStyledKnob::setActiveTrackColor(const CColor& color)
if (activeTrackColor_ == color)
return;
activeTrackColor_ = color;
setDirty();
invalid();
}

void SStyledKnob::setInactiveTrackColor(const CColor& color)
{
if (inactiveTrackColor_ == color)
return;
inactiveTrackColor_ = color;
setDirty();
invalid();
}

void SStyledKnob::setLineIndicatorColor(const CColor& color)
{
if (lineIndicatorColor_ == color)
return;
lineIndicatorColor_ = color;
setDirty();
invalid();
}

void SStyledKnob::draw(CDrawContext* dc)
Expand Down

0 comments on commit dd0b4f3

Please sign in to comment.