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

Editor: Auto-focus enum child editors for int, string, color and any types

directional-lights
Sven Eberhardt 2016-10-15 18:26:03 -04:00
parent 028b576ab3
commit 386f178568
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/editor/C4ConsoleQtPropListViewer.cpp
View File

@ -294,6 +294,8 @@ QWidget *C4PropertyDelegateInt::CreateEditor(const C4PropertyDelegateFactory *pa
connect(editor, &QSpinBox::editingFinished, this, [editor, this]() {
emit EditingDoneSignal(editor);
});
// Selection in child enum: Direct focus
if (by_selection && is_child) editor->setFocus();
return editor;
}
@ -345,6 +347,8 @@ QWidget *C4PropertyDelegateString::CreateEditor(const C4PropertyDelegateFactory
connect(editor, &QLineEdit::textEdited, this, [editor, this]() {
editor->commit_pending = true;
});
// Selection in child enum: Direct focus
if (by_selection && is_child) editor->setFocus();
return editor;
}
@ -742,11 +746,10 @@ QWidget *C4PropertyDelegateColor::CreateEditor(const class C4PropertyDelegateFac
Editor *editor;
std::unique_ptr<Editor> peditor((editor = new Editor(parent)));
connect(editor->button, &QPushButton::pressed, this, [editor, this]() {
QColor clr = QColorDialog::getColor(QColor(editor->last_value.getInt() & (~alpha_mask)), editor, QString(), QColorDialog::ShowAlphaChannel);
editor->last_value.SetInt(clr.rgba() | alpha_mask);
this->SetEditorData(editor, editor->last_value, C4PropertyPath()); // force update on display
emit EditingDoneSignal(editor);
this->OpenColorDialogue(editor);
});
// Selection in child enum: Open dialogue immediately
if (by_selection && is_child) OpenColorDialogue(editor);
return peditor.release();
}
@ -774,6 +777,15 @@ bool C4PropertyDelegateColor::IsPasteValid(const C4Value &val) const
return true;
}
void C4PropertyDelegateColor::OpenColorDialogue(C4PropertyDelegateLabelAndButtonWidget *editor) const
{
// Show actual dialogue to change the color
QColor clr = QColorDialog::getColor(QColor(editor->last_value.getInt() & (~alpha_mask)), editor, QString(), QColorDialog::ShowAlphaChannel);
editor->last_value.SetInt(clr.rgba() | alpha_mask);
this->SetEditorData(editor, editor->last_value, C4PropertyPath()); // force update on display
emit EditingDoneSignal(editor);
}
/* Enum delegate combo box item delegate */
@ -1871,6 +1883,8 @@ QWidget *C4PropertyDelegateC4ValueInput::CreateEditor(const class C4PropertyDele
::Console.EditCursor.InvalidateSelection();
}
});
// Selection in child enum: Direct focus
if (by_selection && is_child) editor->edit->setFocus();
return editor;
}

4
src/editor/C4ConsoleQtPropListViewer.h
View File

@ -231,6 +231,7 @@ class C4PropertyDelegateColor : public C4PropertyDelegate
{
private:
uint32_t alpha_mask;
public:
typedef C4PropertyDelegateLabelAndButtonWidget Editor;
@ -243,6 +244,9 @@ public:
QColor GetDisplayTextColor(const C4Value &val, class C4Object *obj) const override;
QColor GetDisplayBackgroundColor(const C4Value &val, class C4Object *obj) const override;
bool IsPasteValid(const C4Value &val) const override;
private:
void OpenColorDialogue(Editor *editor) const;
};
// Display delegate for deep combo box. Handles the help tooltip showing.