diff --git a/src/musikcube/app/overlay/EqualizerOverlay.cpp b/src/musikcube/app/overlay/EqualizerOverlay.cpp index 343cdeaa5..fce86545d 100644 --- a/src/musikcube/app/overlay/EqualizerOverlay.cpp +++ b/src/musikcube/app/overlay/EqualizerOverlay.cpp @@ -63,7 +63,7 @@ static const std::vector BANDS = { }; static const int VERTICAL_PADDING = 2; -static const int MAX_HEIGHT = 8 + (int) BANDS.size(); +static const int MAX_HEIGHT = 7 + (int) BANDS.size(); static const int DEFAULT_WIDTH = 46; static const int TRACK_WIDTH = 21; static const int DB_LABEL_WIDTH = 6; /* "-XY dB" */ @@ -107,12 +107,10 @@ EqualizerOverlay::EqualizerOverlay() this->plugin = this->FindPlugin(); this->prefs = Preferences::ForPlugin(this->plugin->Name()); - this->titleLabel = std::make_shared(); - this->titleLabel->SetText(_TSTR("equalizer_overlay_title"), text::AlignCenter); - this->titleLabel->SetBold(true); - this->enabledCb = std::make_shared(); this->enabledCb->SetText(_TSTR("equalizer_overlay_enabled")); + this->enabledCb->SetAlignment(text::AlignCenter); + this->enabledCb->SetBold(true); this->enabledCb->SetChecked(this->prefs->GetBool("enabled", false)); this->enabledCb->CheckChanged.connect(this, &EqualizerOverlay::OnEnabledChanged); @@ -129,7 +127,6 @@ EqualizerOverlay::EqualizerOverlay() this->shortcuts->SetAlignment(text::AlignRight); /* add */ - this->AddWindow(this->titleLabel); this->AddWindow(this->enabledCb); this->AddWindow(this->listView); this->AddWindow(this->shortcuts); @@ -140,7 +137,6 @@ EqualizerOverlay::EqualizerOverlay() this->listView->SetFocusOrder(order++); /* style */ - style(*this->titleLabel); style(*this->enabledCb); style(*this->listView); this->listView->SetFrameVisible(true); @@ -178,11 +174,9 @@ void EqualizerOverlay::Layout() { x = 0; y = 0; - this->titleLabel->MoveAndResize(x, y, cx, 1); - y += 2; this->enabledCb->MoveAndResize(x, y, cx, 1); - y += 1; - cy -= 3; + y += 2; + cy -= 2; this->listView->MoveAndResize(x, y, cx, cy - 1); cy = this->GetContentHeight(); diff --git a/src/musikcube/app/overlay/EqualizerOverlay.h b/src/musikcube/app/overlay/EqualizerOverlay.h index 6d20e6948..ecc37defb 100644 --- a/src/musikcube/app/overlay/EqualizerOverlay.h +++ b/src/musikcube/app/overlay/EqualizerOverlay.h @@ -84,7 +84,6 @@ namespace musik { Plugin plugin; Prefs prefs; std::shared_ptr adapter; - std::shared_ptr titleLabel; std::shared_ptr enabledCb; std::shared_ptr listView; std::shared_ptr shortcuts; diff --git a/src/musikcube/data/locales/en_US.json b/src/musikcube/data/locales/en_US.json index 350454e76..68318618e 100644 --- a/src/musikcube/data/locales/en_US.json +++ b/src/musikcube/data/locales/en_US.json @@ -162,8 +162,7 @@ "visualizer_overlay_title": "visualizers", "visualizer_overlay_no_visualizers_message": "no visualizers found!", - "equalizer_overlay_title": "equalizer", - "equalizer_overlay_enabled": "enabled", + "equalizer_overlay_enabled": "equalizer enabled", "equalizer_overlay_frequencies": "frequency bands", "equalizer_button_load": "load", "equalizer_button_save": "save",