summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorronso0 <ronso0@mixxx.org>2020-09-30 17:55:17 +0200
committerronso0 <ronso0@mixxx.org>2020-09-30 17:55:17 +0200
commit7261a7efebc7064c88eaf1ab413fbb0a67c09883 (patch)
tree0c8afb4c9fdd0213e19bd8d0f2229adf1425a34b
parent827782c7661150e7faff234cc01c9292ef324028 (diff)
Waveform: apply configured beatgrid opacity after start
-rw-r--r--src/preferences/dialog/dlgprefwaveform.cpp1
-rw-r--r--src/waveform/waveformwidgetfactory.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/preferences/dialog/dlgprefwaveform.cpp b/src/preferences/dialog/dlgprefwaveform.cpp
index 1e5fa917d6..cf5fbe1d94 100644
--- a/src/preferences/dialog/dlgprefwaveform.cpp
+++ b/src/preferences/dialog/dlgprefwaveform.cpp
@@ -39,6 +39,7 @@ DlgPrefWaveform::DlgPrefWaveform(QWidget* pParent, MixxxMainWindow* pMixxx,
// slotUpdate can generate rebootMixxxView calls.
// TODO(XXX): Improve this awkwardness.
slotUpdate();
+
connect(frameRateSpinBox,
SIGNAL(valueChanged(int)),
this,
diff --git a/src/waveform/waveformwidgetfactory.cpp b/src/waveform/waveformwidgetfactory.cpp
index 3d82356d1b..90de92e4c2 100644
--- a/src/waveform/waveformwidgetfactory.cpp
+++ b/src/waveform/waveformwidgetfactory.cpp
@@ -519,6 +519,7 @@ bool WaveformWidgetFactory::setWidgetTypeFromHandle(int handleIndex, bool force)
//previousWidget->hold();
double previousZoom = previousWidget->getZoomFactor();
double previousPlayMarkerPosition = previousWidget->getPlayMarkerPosition();
+ double previousbeatgridAlpha = previousWidget->beatGridAlpha();
delete previousWidget;
WWaveformViewer* viewer = holder.m_waveformViewer;
WaveformWidgetAbstract* widget = createWaveformWidget(m_type, holder.m_waveformViewer);
@@ -527,6 +528,7 @@ bool WaveformWidgetFactory::setWidgetTypeFromHandle(int handleIndex, bool force)
viewer->setup(holder.m_skinNodeCache, holder.m_skinContextCache);
viewer->setZoom(previousZoom);
viewer->setPlayMarkerPosition(previousPlayMarkerPosition);
+ viewer->setDisplayBeatGridAlpha(previousbeatgridAlpha);
// resize() doesn't seem to get called on the widget. I think Qt skips
// it since the size didn't change.
//viewer->resize(viewer->size());