Roxas UI improvments

plugins/SlicerT/SlicerTView.cpp

@@ -44,13 +44,11 @@ namespace gui {
 SlicerTView::SlicerTView(SlicerT* instrument, QWidget* parent)
 	: InstrumentViewFixedSize(instrument, parent)
 	, m_slicerTParent(instrument)
-	, m_noteThresholdKnob(this)
-	, m_fadeOutKnob(this)
-	, m_bpmBox(3, "21pink", this)
+	, m_bpmBox(3, "19purple", this)
 	, m_snapSetting(this, tr("Slice snap"))
 	, m_syncToggle("Sync", this, tr("SyncToggle"), LedCheckBox::LedColor::Green)
-	, m_resetButton(this, nullptr)
-	, m_midiExportButton(this, nullptr)
+	, m_resetButton(this)
+	, m_midiExportButton(this)
 	, m_wf(248, 128, instrument, this)
 {
 	// window settings
@@ -76,38 +74,48 @@ SlicerTView::SlicerTView(SlicerT* instrument, QWidget* parent)
 	m_syncToggle.setModel(&m_slicerTParent->m_enableSync);
 
 	// bpm spin box
-	m_bpmBox.move(130, 203);
+	m_bpmBox.move(130, 201);
 	m_bpmBox.setToolTip(tr("Original sample BPM"));
-	m_bpmBox.setLabel(tr("BPM"));
+	/* m_bpmBox.setLabel(tr("BPM")); */
 	m_bpmBox.setModel(&m_slicerTParent->m_originalBPM);
 
 	// threshold knob
-	m_noteThresholdKnob.move(9, 195);
-	m_noteThresholdKnob.setToolTip(tr("Threshold used for slicing"));
-	m_noteThresholdKnob.setLabel(tr("Threshold"));
-	m_noteThresholdKnob.setModel(&m_slicerTParent->m_noteThreshold);
+	m_noteThresholdKnob = createStyledKnob();
+	m_noteThresholdKnob->move(10, 197);
+	m_noteThresholdKnob->setToolTip(tr("Threshold used for slicing"));
+	/* m_noteThresholdKnob->setLabel(tr("Threshold")); */
+	m_noteThresholdKnob->setModel(&m_slicerTParent->m_noteThreshold);
 
 	// fadeout knob
-	m_fadeOutKnob.move(75, 195);
-	m_fadeOutKnob.setToolTip(tr("Fade Out for notes"));
-	m_fadeOutKnob.setLabel(tr("Fade Out"));
-	m_fadeOutKnob.setModel(&m_slicerTParent->m_fadeOutFrames);
+	m_fadeOutKnob = createStyledKnob();
+	m_fadeOutKnob->move(64, 197);
+	m_fadeOutKnob->setToolTip(tr("Fade Out for notes"));
+	/* m_fadeOutKnob->setLabel(tr("Fade Out")); */
+	m_fadeOutKnob->setModel(&m_slicerTParent->m_fadeOutFrames);
 
 	// midi copy button
-	m_midiExportButton.move(215, 150);
-	m_midiExportButton.setActiveGraphic(PLUGIN_NAME::getIconPixmap("copyMidi"));
-	m_midiExportButton.setInactiveGraphic(PLUGIN_NAME::getIconPixmap("copyMidi"));
+	m_midiExportButton.move(199, 150);
+	m_midiExportButton.setIcon(PLUGIN_NAME::getIconPixmap("copyMidi"));
 	m_midiExportButton.setToolTip(tr("Copy midi pattern to clipboard"));
 	connect(&m_midiExportButton, &PixmapButton::clicked, this, &SlicerTView::exportMidi);
 
 	// slice reset button
-	m_resetButton.move(19, 150);
-	m_resetButton.setActiveGraphic(PLUGIN_NAME::getIconPixmap("resetSlices"));
-	m_resetButton.setInactiveGraphic(PLUGIN_NAME::getIconPixmap("resetSlices"));
+	m_resetButton.move(18, 150);
+	m_resetButton.setIcon(PLUGIN_NAME::getIconPixmap("resetSlices"));
 	m_resetButton.setToolTip(tr("Reset Slices"));
 	connect(&m_resetButton, &PixmapButton::clicked, m_slicerTParent, &SlicerT::updateSlices);
 }
 
+// style knob, defined in data/themes/default/style.css#L949
+Knob* SlicerTView::createStyledKnob()
+{
+	Knob* newKnob = new Knob(KnobType::Styled, this);
+	newKnob->setFixedSize(50, 40);
+	newKnob->setCenterPointX(24.0);
+	newKnob->setCenterPointY(15.0);
+	return newKnob;
+}
+
 // copied from piano roll
 void SlicerTView::exportMidi()
 {
@@ -177,10 +185,17 @@ void SlicerTView::paintEvent(QPaintEvent* pe)
 {
 	QPainter brush(this);
 	brush.setPen(QColor(255, 255, 255));
-	brush.setFont(QFont(brush.font().family(), 7.5f, -1, false));
-	brush.drawText(212, 165, 25, 20, Qt::AlignCenter, tr("Midi"));
-	brush.drawText(14, 165, 30, 20, Qt::AlignCenter, tr("Reset"));
-	brush.drawText(185, 217, 55, 20, Qt::AlignCenter, tr("Snap"));
+	brush.setFont(QFont(brush.font().family(), 7, -1, false));
+
+	// top text
+	brush.drawText(8, topTextY, textBoxWidth, textBoxHeight, Qt::AlignCenter, tr("Reset"));
+	brush.drawText(188, topTextY, textBoxWidth, textBoxHeight, Qt::AlignCenter, tr("Midi"));
+
+	// bottom text
+	brush.drawText(8, bottomTextY, textBoxWidth, textBoxHeight, Qt::AlignCenter, tr("Threshold"));
+	brush.drawText(63, bottomTextY, textBoxWidth, textBoxHeight, Qt::AlignCenter, tr("Fade Out"));
+	brush.drawText(127, bottomTextY, textBoxWidth, textBoxHeight, Qt::AlignCenter, tr("BPM"));
+	brush.drawText(188, bottomTextY, textBoxWidth, textBoxHeight, Qt::AlignCenter, tr("Snap"));
 }
 
 } // namespace gui

plugins/SlicerT/SlicerTView.h

@@ -42,19 +42,6 @@ class SlicerT;
 
 namespace gui {
 
-// style knob, defined in data/themes/default/style.css#L949
-class SlicerTKnob : public Knob
-{
-public:
-	SlicerTKnob(QWidget* _parent)
-		: Knob(KnobType::Styled, _parent)
-	{
-		setFixedSize(50, 40);
-		setCenterPointX(24.0);
-		setCenterPointY(15.0);
-	}
-};
-
 class SlicerTView : public InstrumentViewFixedSize
 {
 	Q_OBJECT
@@ -65,6 +52,11 @@ protected slots:
 public:
 	SlicerTView(SlicerT* instrument, QWidget* parent);
 
+	static constexpr int textBoxHeight = 20;
+	static constexpr int textBoxWidth = 50;
+	static constexpr int topTextY = 170;
+	static constexpr int bottomTextY = 220;
+
 protected:
 	virtual void dragEnterEvent(QDragEnterEvent* _dee);
 	virtual void dropEvent(QDropEvent* _de);
@@ -75,17 +67,19 @@ protected slots:
 	SlicerT* m_slicerTParent;
 
 	// lmms UI
-	SlicerTKnob m_noteThresholdKnob;
-	SlicerTKnob m_fadeOutKnob;
+	Knob* m_noteThresholdKnob;
+	Knob* m_fadeOutKnob;
 	LcdSpinBox m_bpmBox;
 	ComboBox m_snapSetting;
 	LedCheckBox m_syncToggle;
 
 	// buttons
-	PixmapButton m_resetButton;
-	PixmapButton m_midiExportButton;
+	QPushButton m_resetButton;
+	QPushButton m_midiExportButton;
 
 	SlicerTWaveform m_wf;
+
+	Knob* createStyledKnob();
 };
 } // namespace gui
 } // namespace lmms

plugins/SlicerT/SlicerTWaveform.cpp

@@ -81,6 +81,11 @@ void SlicerTWaveform::drawSeekerWaveform()
 
 	m_slicerTParent->m_originalSample.visualize(brush, QRect(0, 0, m_seekerWaveform.width(), m_seekerWaveform.height()),
 		0, m_slicerTParent->m_originalSample.frames());
+
+	// increase brightness in inner color
+	QBitmap innerMask = m_seekerWaveform.createMaskFromColor(s_waveformMaskColor, Qt::MaskMode::MaskOutColor);
+	brush.setPen(s_waveformInnerColor);
+	brush.drawPixmap(0, 0, innerMask);
 }
 
 void SlicerTWaveform::drawSeeker()
@@ -139,6 +144,11 @@ void SlicerTWaveform::drawEditorWaveform()
 	float zoomOffset = (m_editorHeight - m_zoomLevel * m_editorHeight) / 2;
 	m_slicerTParent->m_originalSample.visualize(
 		brush, QRect(0, zoomOffset, m_editorWidth, m_zoomLevel * m_editorHeight), startFrame, endFrame);
+
+	// increase brightness in inner color
+	QBitmap innerMask = m_editorWaveform.createMaskFromColor(s_waveformMaskColor, Qt::MaskMode::MaskOutColor);
+	brush.setPen(s_waveformInnerColor);
+	brush.drawPixmap(0, 0, innerMask);
 }
 
 void SlicerTWaveform::drawEditor()

plugins/SlicerT/SlicerTWaveform.h

@@ -58,9 +58,11 @@ public slots:
 
 	// colors
 	const QColor s_emptyColor = QColor(0, 0, 0, 0);
-	
+
 	const QColor s_waveformColor = QColor(123, 49, 212);
 	const QColor s_waveformBgColor = QColor(255, 255, 255, 0);
+	const QColor s_waveformMaskColor = QColor(151, 65, 255); // update this if s_waveformColor changes
+	const QColor s_waveformInnerColor = QColor(183, 124, 255);
 
 	const QColor s_playColor = QColor(255, 255, 255, 200);
 	const QColor s_playHighlightColor = QColor(255, 255, 255, 70);