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

fix list widgets selection

Browse Source
This commit is contained in:
T1ti
2024-09-11 23:09:43 +02:00
parent 79db946f40
commit 0b45432c5f
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/noggit/ui/TexturingGUI.cpp
View File

@@ -187,13 +187,16 @@ namespace Noggit
list->setWrapping (true);
list->setModel (search_filter);
connect ( list, &QAbstractItemView::clicked
, [=] (QModelIndex const& index)
{
emit selected
("tileset/" + index.data().toString().toStdString());
}
);
connect(list->selectionModel(), &QItemSelectionModel::selectionChanged,
[=]()
{
QModelIndexList selectedIndexes = list->selectionModel()->selectedIndexes();
if (!selectedIndexes.isEmpty())
{
QModelIndex index = selectedIndexes.first();
emit selected("tileset/" + index.data().toString().toStdString());
}
});
auto size_slider (new QSlider (Qt::Horizontal));
size_slider->setRange (64, 256);

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

@@ -310,8 +310,11 @@ namespace Noggit::Ui::Windows
_continents_table->setSelectionMode(QAbstractItemView::SelectionMode::SingleSelection);
_continents_table->setSelectionBehavior(QAbstractItemView::SelectItems);
// in some situations like when returning to menu an item is selected and itemSelectionChanged won't fire when reclicking it
// so might need to also connect itemClicked but then they both trigger at the same time.
QObject::connect(_continents_table, &QListWidget::itemSelectionChanged, [this]()
{
QSignalBlocker const blocker(_continents_table);
QListWidgetItem* const item = _continents_table->currentItem();
if (item)
{
@@ -476,22 +479,22 @@ namespace Noggit::Ui::Windows
_map_wizard_connection = connect(_map_creation_wizard,
&Noggit::Ui::Tools::MapCreationWizard::Ui::MapCreationWizard::map_dbc_updated,
[this](int map_id)
[this](int map_id = -1)
{
_buildMapListComponent->buildMapList(this);
// if a new map was added select it
if (map_id)
if (map_id >= 0)
{
for (int i = 0; i < _continents_table->count(); ++i)
{
QListWidgetItem* item = _continents_table->item(i);
if (item && item->data(Qt::UserRole).toInt() == map_id)
{
_continents_table->setCurrentItem(item);
_continents_table->setCurrentItem(item); // calls itemSelectionChanged -> loadmap
_continents_table->scrollToItem(item);
_right_side->setCurrentIndex(0); // swap to "enter map" tab
loadMap(map_id);
// loadMap(map_id);
break;
}
}

5
src/noggit/ui/windows/noggitWindow/components/BuildMapListComponent.cpp
View File

@@ -12,7 +12,10 @@ using namespace Noggit::Ui::Component;
void BuildMapListComponent::buildMapList(Noggit::Ui::Windows::NoggitWindow* parent)
{
parent->_continents_table->clear();
{
QSignalBlocker const blocker(parent->_continents_table);
parent->_continents_table->clear(); // // calls itemSelectionChanged
}
const auto& table = std::string("Map");
auto map_table = parent->_project->ClientDatabase->LoadTable(table, readFileAsIMemStream);