feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix for Binding Editor launch pos

Browse Source 
Task: QDS-1418

Change-Id: Id0c051d7187648a1477de70769fb7a47363ccdeb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2020-06-09 13:46:14 +02:00
parent 01b0d4f8f5
commit def4655042
6 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionLogic.qml
View File

@@ -154,9 +154,7 @@ Item {
id: bindingEditorParent
Component.onCompleted: {
var x = extendedFunctionButton.mapToGlobal(0,0).x - 200
var y = extendedFunctionButton.mapToGlobal(0,0).y - 40
bindingEditor.showWidget(x, y)
bindingEditor.showWidget()
bindingEditor.text = backendValue.expression
bindingEditor.prepareBindings()
}

4
share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
View File

@@ -117,9 +117,7 @@ Rectangle {
visible: !isBaseState
text: qsTr("Set when Condition")
onTriggered: {
var x = whenButton.mapToGlobal(0,0).x + 4
var y = root.mapToGlobal(0,0).y - 32
bindingEditor.showWidget(x, y)
bindingEditor.showWidget()
bindingEditor.text = delegateWhenConditionString
bindingEditor.prepareBindings()
}

13
src/plugins/qmldesigner/components/bindingeditor/bindingeditor.cpp
View File

@@ -56,7 +56,7 @@ void BindingEditor::registerDeclarativeType()
qmlRegisterType<BindingEditor>("HelperWidgets", 2, 0, "BindingEditor");
}
void BindingEditor::showWidget(int x, int y)
void BindingEditor::prepareDialog()
{
if (s_lastBindingEditor)
s_lastBindingEditor->hideWidget();
@@ -71,6 +71,17 @@ void BindingEditor::showWidget(int x, int y)
this, &BindingEditor::rejected);
m_dialog->setAttribute(Qt::WA_DeleteOnClose);
}
void BindingEditor::showWidget()
{
prepareDialog();
m_dialog->showWidget();
}
void BindingEditor::showWidget(int x, int y)
{
prepareDialog();
m_dialog->showWidget(x, y);
}

2
src/plugins/qmldesigner/components/bindingeditor/bindingeditor.h
View File

@@ -51,6 +51,7 @@ public:
static void registerDeclarativeType();
Q_INVOKABLE void showWidget();
Q_INVOKABLE void showWidget(int x, int y);
Q_INVOKABLE void hideWidget();
@@ -75,6 +76,7 @@ private:
QVariant backendValue() const;
QVariant modelNodeBackend() const;
QVariant stateModelNode() const;
void prepareDialog();
private:
QPointer<BindingEditorDialog> m_dialog;

9
src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.cpp
View File

@@ -79,14 +79,19 @@ BindingEditorDialog::~BindingEditorDialog()
delete m_verticalLayout;
}
void BindingEditorDialog::showWidget(int x, int y)
void BindingEditorDialog::showWidget()
{
this->show();
this->raise();
move(QPoint(x, y));
m_editorWidget->setFocus();
}
void BindingEditorDialog::showWidget(int x, int y)
{
showWidget();
move(QPoint(x, y));
}
QString BindingEditorDialog::editorValue() const
{
if (!m_editorWidget)

1
src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.h
View File

@@ -67,6 +67,7 @@ public:
BindingEditorDialog(QWidget *parent = nullptr, DialogType type = DialogType::BindingDialog);
~BindingEditorDialog() override;
void showWidget();
void showWidget(int x, int y);
QString editorValue() const;