diff --git a/CHANGELOG.md b/CHANGELOG.md index 3921e29..713e90b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Future * Memory view now shows compressed memory when zswap is used * Implemented Intel GPU backend + * Performance side panel is now resizable # 1.0.5 * Perf -> Network: diff --git a/src/configuration.cpp b/src/configuration.cpp index e57c19f..b08194c 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -132,6 +132,7 @@ void Configuration::Load() this->PerfNetworkUseBits = s.value("Performance/NetworkUseBits", this->PerfNetworkUseBits).toBool(); this->PerfGraphWindowSec = s.value("Performance/GraphWindowSec", this->PerfGraphWindowSec).toInt(); this->PerfSidePanelGroupOrder = s.value("Performance/SidePanelGroupOrder", this->PerfSidePanelGroupOrder).toStringList(); + this->PerformanceSplitterState = s.value("Performance/SplitterState", this->PerformanceSplitterState).toByteArray(); // For now this is hardcoded, we may want to make it customizable later this->RefreshRateAvailableIntervals = { 250, 500, 1000, 2000, 5000, 15000 }; @@ -203,6 +204,7 @@ void Configuration::Save() s.setValue("Performance/NetworkUseBits", this->PerfNetworkUseBits); s.setValue("Performance/GraphWindowSec", this->PerfGraphWindowSec); s.setValue("Performance/SidePanelGroupOrder", this->PerfSidePanelGroupOrder); + s.setValue("Performance/SplitterState", this->PerformanceSplitterState); s.sync(); } diff --git a/src/configuration.h b/src/configuration.h index f6a0337..83ca1e2 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -96,6 +96,7 @@ class Configuration : public QObject bool PerfNetworkUseBits { true }; int PerfGraphWindowSec { 60 }; QStringList PerfSidePanelGroupOrder; + QByteArray PerformanceSplitterState; ///< Saved via QSplitter::saveState() private: explicit Configuration(QObject *parent = nullptr); diff --git a/src/perf/sidepanel.cpp b/src/perf/sidepanel.cpp index 425ad7f..7c01876 100644 --- a/src/perf/sidepanel.cpp +++ b/src/perf/sidepanel.cpp @@ -48,7 +48,6 @@ SidePanel::SidePanel(QWidget *parent) : QWidget(parent) this->setLayout(outerLayout); this->setMinimumWidth(150); - this->setMaximumWidth(200); } void SidePanel::ApplyColorScheme() diff --git a/src/performancewidget.cpp b/src/performancewidget.cpp index a79beac..5210665 100644 --- a/src/performancewidget.cpp +++ b/src/performancewidget.cpp @@ -37,6 +37,7 @@ #include #include #include +#include namespace { @@ -134,15 +135,25 @@ void PerformanceWidget::setupLayout() // The .ui gives us a bare QHBoxLayout (horizontalLayout) — populate it. QHBoxLayout *lay = qobject_cast(this->layout()); - lay->addWidget(this->m_sidePanel); + this->m_splitter = new QSplitter(Qt::Horizontal, this); + this->m_splitter->setChildrenCollapsible(false); + this->m_splitter->addWidget(this->m_sidePanel); + this->m_splitter->addWidget(this->m_stack); + this->m_splitter->setStretchFactor(0, 0); + this->m_splitter->setStretchFactor(1, 1); - // Thin separator line - QFrame *separator = new QFrame(this); - separator->setFrameShape(QFrame::VLine); - separator->setFrameShadow(QFrame::Sunken); - lay->addWidget(separator); + const QByteArray saved_state = CFG->PerformanceSplitterState; + if (!saved_state.isEmpty()) + this->m_splitter->restoreState(saved_state); + else + this->m_splitter->setSizes({ 220, 680 }); - lay->addWidget(this->m_stack, /*stretch=*/1); + connect(this->m_splitter, &QSplitter::splitterMoved, this, [this](int, int) + { + CFG->PerformanceSplitterState = this->m_splitter->saveState(); + }); + + lay->addWidget(this->m_splitter); } void PerformanceWidget::setupSidePanel() diff --git a/src/performancewidget.h b/src/performancewidget.h index 89e118b..3826844 100644 --- a/src/performancewidget.h +++ b/src/performancewidget.h @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -56,6 +57,7 @@ class PerformanceWidget : public QWidget Ui::PerformanceWidget *ui; Perf::SidePanel *m_sidePanel; QStackedWidget *m_stack; + QSplitter *m_splitter { nullptr }; QHash m_detailByItem; Perf::SidePanelItem *m_cpuItem { nullptr }; Perf::SidePanelItem *m_memoryItem { nullptr };