From e4e77b9cc5291daf76d2036e2ea8a698ab8390fa Mon Sep 17 00:00:00 2001 From: Laserlicht <13953785+Laserlicht@users.noreply.github.com> Date: Fri, 11 Apr 2025 22:58:49 +0200 Subject: [PATCH] option to show full background --- mapeditor/campaigneditor/campaigneditor.cpp | 7 +++++++ mapeditor/campaigneditor/campaigneditor.ui | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/mapeditor/campaigneditor/campaigneditor.cpp b/mapeditor/campaigneditor/campaigneditor.cpp index fe9f61431..ec5ce2efe 100644 --- a/mapeditor/campaigneditor/campaigneditor.cpp +++ b/mapeditor/campaigneditor/campaigneditor.cpp @@ -34,6 +34,10 @@ CampaignEditor::CampaignEditor(): ui->actionNew->setIcon(QIcon{":/icons/document-new.png"}); ui->actionScenarioProperties->setIcon(QIcon{":/icons/menu-settings.png"}); ui->actionCampaignProperties->setIcon(QIcon{":/icons/menu-mods.png"}); + ui->actionShowFullBackground->setIcon(QIcon{":/icons/tool-area.png"}); + + ui->actionShowFullBackground->setCheckable(true); + connect(ui->actionShowFullBackground, &QAction::triggered, [this](){ redraw(); }); campaignScene.reset(new CampaignScene()); ui->campaignView->setScene(campaignScene.get()); @@ -65,6 +69,8 @@ void CampaignEditor::redraw() campaignScene->clear(); auto background = BitmapHandler::loadBitmap(campaignState->getRegions().getBackgroundName().getName()); + if(!ui->actionShowFullBackground->isChecked()) + background = background.copy(0, 0, 456, 600); campaignScene->addItem(new QGraphicsPixmapItem(QPixmap::fromImage(background))); for (auto & s : campaignState->scenarios) { @@ -105,6 +111,7 @@ void CampaignEditor::redraw() campaignScene->addItem(pixmap); } + campaignScene->setSceneRect(background.rect()); ui->campaignView->show(); } diff --git a/mapeditor/campaigneditor/campaigneditor.ui b/mapeditor/campaigneditor/campaigneditor.ui index e23e36e0d..204d7f1a8 100644 --- a/mapeditor/campaigneditor/campaigneditor.ui +++ b/mapeditor/campaigneditor/campaigneditor.ui @@ -47,8 +47,15 @@ + + + View + + + + @@ -68,6 +75,8 @@ + + @@ -144,6 +153,17 @@ Enter + + + Show full background + + + Show full background + + + F + +