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

Update NoggitWindow.cpp | fix map entry minimap render

Browse Source
This commit is contained in:
Skarn
2022-03-12 21:16:21 +03:00
parent f996a32389
commit c7c6562645
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/noggit/ui/windows/noggitWindow/NoggitWindow.cpp
View File

@@ -244,15 +244,15 @@ namespace Noggit::Ui::Windows
{ {
auto item = new QListWidgetItem(bookmarks_table); auto item = new QListWidgetItem(bookmarks_table);
auto mapBookmarkData = Widget::MapListBookmarkData(); auto bookmark_data = Widget::MapListBookmarkData();
mapBookmarkData.MapName = QString::fromStdString(entry.name); bookmark_data.MapName = QString::fromStdString(entry.name);
mapBookmarkData.Position = entry.position; bookmark_data.Position = entry.position;
auto mapBookmarkItem = new Widget::MapListBookmarkItem(mapBookmarkData, bookmarks_table); auto map_bookmark_item = new Widget::MapListBookmarkItem(bookmark_data, bookmarks_table);
item->setData (Qt::UserRole, QVariant (bookmark_index++)); item->setData (Qt::UserRole, QVariant (bookmark_index++));
item->setSizeHint(mapBookmarkItem->minimumSizeHint()); item->setSizeHint(map_bookmark_item->minimumSizeHint());
bookmarks_table->setItemWidget(item, mapBookmarkItem); bookmarks_table->setItemWidget(item, map_bookmark_item);
} }
QObject::connect ( bookmarks_table, &QListWidget::itemDoubleClicked QObject::connect ( bookmarks_table, &QListWidget::itemDoubleClicked
@@ -283,6 +283,7 @@ namespace Noggit::Ui::Windows
_minimap = new minimap_widget (this); _minimap = new minimap_widget (this);
_minimap->draw_boundaries (true); _minimap->draw_boundaries (true);
//_minimap->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
QObject::connect( _minimap, &minimap_widget::map_clicked QObject::connect( _minimap, &minimap_widget::map_clicked
, [this] (::glm::vec3 const& pos) , [this] (::glm::vec3 const& pos)
@@ -293,12 +294,11 @@ namespace Noggit::Ui::Windows
auto right_side = new QTabWidget(this); auto right_side = new QTabWidget(this);
auto minimap_holder = new QWidget(this); auto minimap_holder = new QScrollArea(this);
minimap_holder->setContentsMargins(0, 0, 0, 0); minimap_holder->setWidgetResizable(true);
auto minimap_holder_layout = new QHBoxLayout(this); minimap_holder->setAlignment(Qt::AlignCenter);
minimap_holder->setLayout(minimap_holder_layout); minimap_holder->setWidget(_minimap);
minimap_holder_layout->addWidget(_minimap);
minimap_holder_layout->setAlignment(Qt::AlignCenter);
right_side->addTab(minimap_holder, "Enter map"); right_side->addTab(minimap_holder, "Enter map");
minimap_holder->setAccessibleName("main_menu_minimap_holder"); minimap_holder->setAccessibleName("main_menu_minimap_holder");