From 4d818db64ccb5f0d2e3eb59a4c65c37b3abf3af1 Mon Sep 17 00:00:00 2001 From: Kiara Navarro Date: Sat, 6 Aug 2022 20:11:43 -0500 Subject: [PATCH] tile: minimize full screen if its enabled when adding new graph --- .../CustomWidgets/tilewidget.cpp | 18 ++++++++++++------ .../PC_Application/CustomWidgets/tilewidget.h | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Software/PC_Application/CustomWidgets/tilewidget.cpp b/Software/PC_Application/CustomWidgets/tilewidget.cpp index 2c8e1cb..e5e935a 100644 --- a/Software/PC_Application/CustomWidgets/tilewidget.cpp +++ b/Software/PC_Application/CustomWidgets/tilewidget.cpp @@ -130,6 +130,7 @@ void TileWidget::splitVertically(bool moveContentToSecondChild) isSplit = true; splitter = new QSplitter(Qt::Vertical); split(moveContentToSecondChild); + tryMinimize(); } void TileWidget::splitHorizontally(bool moveContentToSecondChild) @@ -140,6 +141,7 @@ void TileWidget::splitHorizontally(bool moveContentToSecondChild) isSplit = true; splitter = new QSplitter(Qt::Horizontal); split(moveContentToSecondChild); + tryMinimize(); } void TileWidget::closeTile() @@ -295,19 +297,23 @@ void TileWidget::on_bXYplot_clicked() void TileWidget::plotDeleted() { - if (isFullScreen) - { - auto rootTile = findRootTile(); - rootTile->ui->stack->setCurrentWidget(rootTile->ui->ContentPage); - } + tryMinimize(); ui->stack->setCurrentWidget(ui->TilePage); hasContent = false; content = nullptr; } +void TileWidget::tryMinimize() +{ + if (isFullScreen) + { + auto rootTile = findRootTile(); + rootTile->ui->stack->setCurrentWidget(rootTile->ui->ContentPage); + } +} + void TileWidget::on_bWaterfall_clicked() { setContent(new TraceWaterfall(model)); } - diff --git a/Software/PC_Application/CustomWidgets/tilewidget.h b/Software/PC_Application/CustomWidgets/tilewidget.h index 66e385b..07e2364 100644 --- a/Software/PC_Application/CustomWidgets/tilewidget.h +++ b/Software/PC_Application/CustomWidgets/tilewidget.h @@ -54,6 +54,7 @@ private: void setChild(); TileWidget* findRootTile(); void setFullScreen(); + void tryMinimize(); TracePlot *fullScreenPlot; Ui::TileWidget *ui; QSplitter *splitter;