caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #145 from sophiekovalevsky/minimize-tile-full-screen

Browse Source 
tile: minimize full screen when adding new tile if its enabled
This commit is contained in:
jankae 2022-08-09 14:03:50 +02:00 committed by GitHub
commit adc873e776
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Software/PC_Application/CustomWidgets/tilewidget.cpp
View File

@ -130,6 +130,7 @@ void TileWidget::splitVertically(bool moveContentToSecondChild)
isSplit = true; isSplit = true;
splitter = new QSplitter(Qt::Vertical); splitter = new QSplitter(Qt::Vertical);
split(moveContentToSecondChild); split(moveContentToSecondChild);
tryMinimize();
} }
void TileWidget::splitHorizontally(bool moveContentToSecondChild) void TileWidget::splitHorizontally(bool moveContentToSecondChild)
@ -140,6 +141,7 @@ void TileWidget::splitHorizontally(bool moveContentToSecondChild)
isSplit = true; isSplit = true;
splitter = new QSplitter(Qt::Horizontal); splitter = new QSplitter(Qt::Horizontal);
split(moveContentToSecondChild); split(moveContentToSecondChild);
tryMinimize();
} }
void TileWidget::closeTile() void TileWidget::closeTile()
@ -295,19 +297,23 @@ void TileWidget::on_bXYplot_clicked()
void TileWidget::plotDeleted() void TileWidget::plotDeleted()
{ {
if (isFullScreen) tryMinimize();
{
auto rootTile = findRootTile();
rootTile->ui->stack->setCurrentWidget(rootTile->ui->ContentPage);
}
ui->stack->setCurrentWidget(ui->TilePage); ui->stack->setCurrentWidget(ui->TilePage);
hasContent = false; hasContent = false;
content = nullptr; content = nullptr;
} }
void TileWidget::tryMinimize()
{
if (isFullScreen)
{
auto rootTile = findRootTile();
rootTile->ui->stack->setCurrentWidget(rootTile->ui->ContentPage);
}
}
void TileWidget::on_bWaterfall_clicked() void TileWidget::on_bWaterfall_clicked()
{ {
setContent(new TraceWaterfall(model)); setContent(new TraceWaterfall(model));
} }

1
Software/PC_Application/CustomWidgets/tilewidget.h
View File

@ -54,6 +54,7 @@ private:
void setChild(); void setChild();
TileWidget* findRootTile(); TileWidget* findRootTile();
void setFullScreen(); void setFullScreen();
void tryMinimize();
TracePlot *fullScreenPlot; TracePlot *fullScreenPlot;
Ui::TileWidget *ui; Ui::TileWidget *ui;
QSplitter *splitter; QSplitter *splitter;