Skip to content

Commit 8d5234e

Browse files
committed
refactor: remove unused m_sidebarCollapsedSize from SlicerPage
refactor(audio-visualizer): fix Y-label positioning with splitter offset, connect vertical scroll, hardcode playcursor line width refactor(phoneme-editor): use chartRect.width() in paintYAxisContent instead of yAxisWidth() refactor(phoneme-editor): reformat TierLabelPanel, extract TierLabelArea setViewportController, add IntervalTierView setViewport refactor(phoneme-editor): reformat ChartPanelBase and add verticalContentScrolled signal refactor(pitch-editor): replace hScale with pixelsPerSecond() derived from coord, remove getPixelsPerSecond() fix(pitch-editor): guard sidebar restore with isEmpty check, save expanded sizes on toggle refactor(pitch-editor): restructure PropertyPanel from 3-column to single-column layout with sections refactor(pitch-editor): forward onViewportUpdate to ChartPanelBase, bridge verticalScrolled signal
1 parent 38f0351 commit 8d5234e

19 files changed

Lines changed: 397 additions & 399 deletions

src/apps/shared/audio-visualizer/AudioVisualizerContainer.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <QPointer>
1313
#include <QResizeEvent>
1414
#include <QTimer>
15+
#include <QVBoxLayout>
1516
#include <QWheelEvent>
1617
#include <algorithm>
1718
#include <dsfw/widgets/PlayWidget.h>
@@ -69,7 +70,7 @@ namespace dstools {
6970
m_chartSplitter->setHandleWidth(4);
7071
m_chartSplitter->setStyleSheet(QStringLiteral("QSplitter::handle { background-color: transparent; }"));
7172
m_chartSplitter->installEventFilter(this);
72-
m_dataArea->layout()->addWidget(m_chartSplitter, 1);
73+
static_cast<QVBoxLayout *>(m_dataArea->layout())->addWidget(m_chartSplitter, 1);
7374

7475
m_boundaryOverlay = new BoundaryOverlayWidget(m_viewport, m_dataArea);
7576
m_boundaryOverlay->trackWidget(m_chartSplitter);
@@ -339,6 +340,8 @@ namespace dstools {
339340
if (!m_leftPane || !m_chartSplitter)
340341
return;
341342

343+
int splitterY = m_chartSplitter->pos().y();
344+
342345
for (int i = 0; i < m_chartSplitter->count(); ++i) {
343346
QWidget *child = m_chartSplitter->widget(i);
344347
if (!child->isVisible())
@@ -351,15 +354,20 @@ namespace dstools {
351354
if (!labelWidget)
352355
continue;
353356

354-
QPoint childPos = child->pos();
355-
int yOffset = childPos.y();
357+
int yOffset = splitterY + child->pos().y();
356358
int childHeight = child->height();
357359

358360
labelWidget->setFixedWidth(m_yAxisWidth > 0 ? m_yAxisWidth : 52);
359361
labelWidget->move(0, yOffset);
360362
labelWidget->setFixedHeight(childHeight);
361363
labelWidget->show();
362364

365+
if (auto *base = dynamic_cast<phonemelabeler::ChartPanelBase *>(child)) {
366+
QWidget *label = labelWidget;
367+
connect(base, &phonemelabeler::ChartPanelBase::verticalContentScrolled,
368+
label, [label]() { label->update(); });
369+
}
370+
363371
m_yAxisLabels.append(labelWidget);
364372
}
365373
}

src/apps/shared/audio-visualizer/AudioVisualizerContainer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ namespace dstools {
192192
double xToTimeGlobal(qreal globalX) const;
193193
void installDragEventFilters();
194194
void removeDragEventFilters();
195-
void updateDragControllerPPS();
196195
void resizeEvent(QResizeEvent *event) override;
197196
void wheelEvent(QWheelEvent *event) override;
198197
bool eventFilter(QObject *watched, QEvent *event) override;

src/apps/shared/audio-visualizer/PlayCursorOverlay.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void PlayCursorOverlay::paintEvent(QPaintEvent *) {
4747

4848
double x = std::clamp(timeToX(m_positionSec), 0.0, static_cast<double>(width()));
4949

50-
painter.setPen(QPen(dsfw::Theme::instance().palette().pianoRoll.playhead, m_lineWidth));
50+
painter.setPen(QPen(dsfw::Theme::instance().palette().pianoRoll.playhead, 2));
5151
painter.drawLine(QPointF(x, 0), QPointF(x, height()));
5252
}
5353

src/apps/shared/data-sources/SlicerPage.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ class SlicerPage : public EditorContainerBase, public labeler::IPageActions, pub
8686
dstools::AppSettings m_settings;
8787

8888
QList<int> m_sidebarExpandedSize;
89-
QList<int> m_sidebarCollapsedSize;
9089

9190
virtual void buildLayout();
9291
virtual void connectSignals();

0 commit comments

Comments
 (0)