From a972ecdf5def282ce17c7715f715ffbe0fc0970c Mon Sep 17 00:00:00 2001 From: "Kwabena W. Agyeman" Date: Thu, 21 Nov 2024 18:55:10 -0800 Subject: [PATCH] openmv: Fixed output pane on startup. --- src/plugins/coreplugin/outputpanemanager.cpp | 17 ++++++++++++++++- src/plugins/coreplugin/outputpanemanager.h | 3 +++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index 7d9d30ae9f8..7c58c60e043 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -567,7 +567,9 @@ void OutputPaneManager::initialize() cmd->action()); data.button = button; connect(button, &OutputPaneToggleButton::contextMenuRequested, m_instance, [] { - m_instance->popupMenu(); + // OPENMV-DIFF // + // m_instance->popupMenu(); + // OPENMV-DIFF // }); connect(outPane, &IOutputPane::flashButton, button, [button] { button->flash(); }); @@ -612,6 +614,12 @@ void OutputPaneManager::initialize() const int index = m_instance->currentIndex(); m_instance->updateActions(index >= 0 ? g_outputPanes.at(index).pane : nullptr); }); + // OPENMV-DIFF // + QTimer::singleShot(0, m_instance, [] () { + if (m_instance->m_outputPaneVisibleOnStartup) + m_instance->showPage(m_instance->m_outputWidgetPane->currentIndex(), IOutputPane::ModeSwitch); + }); + // OPENMV-DIFF // } OutputPaneManager::~OutputPaneManager() = default; @@ -687,6 +695,10 @@ void OutputPaneManager::readSettings() = settings->value("OutputPanePlaceHolder/Height", 0).toInt(); const int currentIdx = settings->value("OutputPanePlaceHolder/CurrentIndex", 0).toInt(); + // OPENMV-DIFF // + m_outputPaneVisibleOnStartup + = settings->value("OutputPanePlaceHolder/Visible", false).toBool(); + // OPENMV-DIFF // if (QTC_GUARD(currentIdx >= 0 && currentIdx < g_outputPanes.size())) setCurrentIndex(currentIdx); } @@ -893,6 +905,9 @@ void OutputPaneManager::saveSettings() const heightSetting = curr->nonMaximizedSize(); settings->setValue("OutputPanePlaceHolder/Height", heightSetting); settings->setValue("OutputPanePlaceHolder/CurrentIndex", currentIndex()); + // OPENMV-DIFF // + settings->setValue("OutputPanePlaceHolder/Visible", OutputPanePlaceHolder::isCurrentVisible()); + // OPENMV-DIFF // } void OutputPaneManager::clearPage() diff --git a/src/plugins/coreplugin/outputpanemanager.h b/src/plugins/coreplugin/outputpanemanager.h index b89d49595d3..65d79c5cacd 100644 --- a/src/plugins/coreplugin/outputpanemanager.h +++ b/src/plugins/coreplugin/outputpanemanager.h @@ -87,6 +87,9 @@ public slots: QStackedWidget *m_opToolBarWidgets = nullptr; QWidget *m_buttonsWidget = nullptr; int m_outputPaneHeightSetting = 0; + // OPENMV-DIFF // + bool m_outputPaneVisibleOnStartup = false; + // OPENMV-DIFF // }; class BadgeLabel