Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-26 18:06:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove scrollArea surrounding graphicsView_Map

Browse Source
This commit is contained in:
BigBahss
2020-10-13 10:14:16 -04:00
parent 5247dd18c0
commit ef9c4c73c3
3 changed files with 25 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/editor.cpp
View File

@@ -898,33 +898,13 @@ void Editor::scaleMapView(int s) {
if ((scale_exp + s) <= 5 && (scale_exp + s) >= -2) // sane limits
{
if (s == 0)
s = -scale_exp;
scale_exp += s;
double base = scale_base;
double exp = scale_exp;
double sfactor = pow(base, s);
const auto mapAnchor = ui->graphicsView_Map->transformationAnchor();
const auto connectionsAnchor = ui->graphicsView_Connections->transformationAnchor();
ui->graphicsView_Map->setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
ui->graphicsView_Connections->setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
scale_exp = 0;
else
scale_exp += s;
double sfactor = pow(scale_base, s);
ui->graphicsView_Map->scale(sfactor, sfactor);
ui->graphicsView_Connections->scale(sfactor, sfactor);
int width = static_cast<int>(ceil((scene->width()) * pow(base, exp))) + 2;
int height = static_cast<int>(ceil((scene->height()) * pow(base, exp))) + 2;
QSize viewSize = ui->scrollAreaWidgetContents_5->size();
int minWidth = qMin(width, viewSize.width());
int minHeight = qMin(height, viewSize.height());
ui->graphicsView_Map->setFixedSize(minWidth, minHeight);
ui->graphicsView_Connections->setFixedSize(minWidth, minHeight);
ui->graphicsView_Map->setTransformationAnchor(mapAnchor);
ui->graphicsView_Connections->setTransformationAnchor(connectionsAnchor);
}
}

1
src/mainwindow.cpp
View File

@@ -563,7 +563,6 @@ void MainWindow::refreshMapScene()
ui->graphicsView_Map->setScene(editor->scene);
ui->graphicsView_Map->setSceneRect(editor->scene->sceneRect());
ui->graphicsView_Map->setFixedSize(width, height);
ui->graphicsView_Map->editor = editor;
ui->graphicsView_Connections->setScene(editor->scene);