From f404f8c11f49dd6c89e8924266f4c112440323a0 Mon Sep 17 00:00:00 2001 From: BigBahss Date: Tue, 13 Oct 2020 12:23:13 -0400 Subject: [PATCH] Remove scrollArea surrounding graphicsView_Connections --- forms/mainwindow.ui | 267 +++++++++++++++----------------------------- src/mainwindow.cpp | 7 -- 2 files changed, 92 insertions(+), 182 deletions(-) diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui index e79eebd8..d9d28960 100644 --- a/forms/mainwindow.ui +++ b/forms/mainwindow.ui @@ -2071,7 +2071,7 @@ 0 - + @@ -2195,7 +2195,41 @@ - + + + + + 0 + 0 + + + + false + + + false + + + Qt::ScrollBarAsNeeded + + + Qt::ScrollBarAsNeeded + + + QAbstractScrollArea::AdjustIgnored + + + QGraphicsView::NoDrag + + + QGraphicsView::AnchorUnderMouse + + + QGraphicsView::AnchorUnderMouse + + + + @@ -2311,200 +2345,83 @@ - - + + + + + 0 + 0 + + QFrame::StyledPanel QFrame::Raised - + + + 4 + - 0 + 4 - 0 + 4 - 0 + 4 - 0 + 4 - - 0 - - - - - - 1 - 0 - + + + + Dive Map - - true - - - - - 0 - 0 - 118 - 118 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - 0 - 0 - 0 - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - 0 - + + + + <html><head/><body><p>Destination map name when using <span style=" font-weight:600;">Dive</span>. If empty, no such connection will exist.</p></body></html> - - QFrame::StyledPanel + + true - - QFrame::Raised - - - - 4 - - - 4 - - - 4 - - - 4 - - - 4 - - - - - Dive Map - - - - - - - <html><head/><body><p>Destination map name when using <span style=" font-weight:600;">Dive</span>. If empty, no such connection will exist.</p></body></html> - - - true - - - - - - - Emerge Map - - - - - - - <html><head/><body><p>Destination map name when emerging using <span style=" font-weight:600;">Dive</span>. If empty, no such connection will exist.</p></body></html> - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + + Emerge Map + + + + + + + <html><head/><body><p>Destination map name when emerging using <span style=" font-weight:600;">Dive</span>. If empty, no such connection will exist.</p></body></html> + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 38f51b9d..3d2edab6 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -555,19 +555,12 @@ void MainWindow::refreshMapScene() { on_mainTabBar_tabBarClicked(ui->mainTabBar->currentIndex()); - double base = editor->scale_base; - double exp = editor->scale_exp; - - int width = static_cast(ceil((editor->scene->width()) * pow(base,exp))) + 2; - int height = static_cast(ceil((editor->scene->height()) * pow(base,exp))) + 2; - ui->graphicsView_Map->setScene(editor->scene); ui->graphicsView_Map->setSceneRect(editor->scene->sceneRect()); ui->graphicsView_Map->editor = editor; ui->graphicsView_Connections->setScene(editor->scene); ui->graphicsView_Connections->setSceneRect(editor->scene->sceneRect()); - ui->graphicsView_Connections->setFixedSize(width, height); ui->graphicsView_Metatiles->setScene(editor->scene_metatiles); //ui->graphicsView_Metatiles->setSceneRect(editor->scene_metatiles->sceneRect());