natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/sshumakov3/noggit-red.git

Browse Source
This commit is contained in:
Balkron
2020-11-05 00:23:31 +05:00
parent 3eff19efd2 a8d26e252f
commit c9f5e3cfbe
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/noggit/ui/main_window.cpp
View File

@@ -44,6 +44,7 @@ namespace noggit
: QMainWindow (nullptr)
, _null_widget (new QWidget (this))
{
std::stringstream title;
title << "Noggit - " << STRPRODUCTVER;
setWindowTitle (QString::fromStdString (title.str()));
@@ -62,7 +63,6 @@ namespace noggit
_settings = new settings(this);
_menuBar = menuBar();
_menuBar->setNativeMenuBar(false);
titleBarWidget.horizontalLayout->insertWidget(1, _menuBar);
_menuBar->setMaximumHeight(20);
@@ -326,8 +326,8 @@ namespace noggit
}
);
auto right_side_holder = new QWidget(this);
auto right_side = new QTabWidget(this);
right_side->setDocumentMode(true);
auto minimap_holder = new QWidget(this);
auto minimap_holder_layout = new QHBoxLayout(this);
@@ -339,7 +339,9 @@ namespace noggit
_map_creation_wizard = new noggit::Red::MapCreationWizard::Ui::MapCreationWizard(this);
right_side->addTab(_map_creation_wizard, "Edit map");
layout->addWidget(right_side);
right_side_holder->setLayout(new QHBoxLayout(right_side_holder));
right_side_holder->layout()->addWidget(right_side);
layout->addWidget(right_side_holder);
setCentralWidget (widget);