marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Qt Editor: Fix grouped item selection in enum property delegate

qteditor
Sven Eberhardt 2016-06-20 19:48:02 -04:00
parent e97491940f
commit 9d9db0d9d5
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/editor/C4ConsoleQtPropListViewer.cpp
View File

@ -542,6 +542,10 @@ void C4DeepQComboBox::hidePopup()
setCurrentIndex(current.row());
::Console.EditCursor.SetHighlightedObject(nullptr);
QComboBox::hidePopup();
if (selected_data.type() == QVariant::Int)
{
emit NewItemSelected(selected_data.toInt());
}
}
descending = item_clicked = false;
}
@ -552,6 +556,21 @@ void C4DeepQComboBox::setCurrentModelIndex(QModelIndex new_index)
setCurrentIndex(new_index.row());
}
int32_t C4DeepQComboBox::GetCurrentSelectionIndex()
{
QVariant selected_data = model()->data(model()->index(currentIndex(), 0, rootModelIndex()), OptionIndexRole);
if (selected_data.type() == QVariant::Int)
{
// Valid selection
return selected_data.toInt();
}
else
{
// Invalid selection
return -1;
}
}
// event filter for view: Catch mouse clicks to prevent closing from simple mouse clicks
bool C4DeepQComboBox::eventFilter(QObject *obj, QEvent *event)
{
@ -723,7 +742,7 @@ void C4PropertyDelegateEnum::UpdateEditorParameter(C4PropertyDelegateEnum::Edito
editor->parameter_widget->deleteLater();
editor->parameter_widget = NULL;
}
int32_t idx = editor->option_box->currentIndex();
int32_t idx = editor->option_box->GetCurrentSelectionIndex();
if (idx < 0 || idx >= options.size()) return;
const Option &option = options[idx];
// Lazy-resolve parameter delegate
@ -853,8 +872,7 @@ QWidget *C4PropertyDelegateEnum::CreateEditor(const C4PropertyDelegateFactory *p
editor->option_box = new C4DeepQComboBox(editor);
editor->layout->addWidget(editor->option_box);
for (auto &option : options) editor->option_box->addItem(option.name->GetCStr());
void (QComboBox::*currentIndexChanged)(int) = &QComboBox::currentIndexChanged;
connect(editor->option_box, currentIndexChanged, editor, [editor, this](int newval) {
connect(editor->option_box, &C4DeepQComboBox::NewItemSelected, editor, [editor, this](int32_t newval) {
if (!editor->updating) this->UpdateOptionIndex(editor, newval); });
editor->updating = false;
editor->option_box->setModel(CreateOptionModel());

4
src/editor/C4ConsoleQtPropListViewer.h
View File

@ -216,6 +216,10 @@ public:
void hidePopup() override;
void setCurrentModelIndex(QModelIndex new_index);
int32_t GetCurrentSelectionIndex();
signals:
void NewItemSelected(int32_t new_item);
protected:
// event filter for view: Catch mouse clicks to descend into children