Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
f9fdb8a9
Commit
f9fdb8a9
authored
Mar 21, 2011
by
Thomas Hartmann
Browse files
QmlDesigner.propertyEditor: bugfix
Lock setting of properties during notification.
parent
85c85d84
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
View file @
f9fdb8a9
...
...
@@ -532,6 +532,8 @@ void PropertyEditor::otherPropertyChanged(const QmlObjectNode &fxObjectNode, con
if
(
!
m_selectedNode
.
isValid
())
return
;
m_locked
=
true
;
if
(
fxObjectNode
.
isValid
()
&&
m_currentType
&&
fxObjectNode
==
m_selectedNode
&&
fxObjectNode
.
currentState
().
isValid
())
{
AbstractProperty
property
=
fxObjectNode
.
modelNode
().
property
(
propertyName
);
if
(
fxObjectNode
==
m_selectedNode
||
QmlObjectNode
(
m_selectedNode
).
propertyChangeForCurrentState
()
==
fxObjectNode
)
{
...
...
@@ -541,6 +543,8 @@ void PropertyEditor::otherPropertyChanged(const QmlObjectNode &fxObjectNode, con
setValue
(
m_selectedNode
,
property
.
name
(),
QmlObjectNode
(
m_selectedNode
).
modelValue
(
property
.
name
()));
}
}
m_locked
=
false
;
}
void
PropertyEditor
::
transformChanged
(
const
QmlObjectNode
&
fxObjectNode
,
const
QString
&
propertyName
)
...
...
@@ -837,8 +841,10 @@ void PropertyEditor::instanceInformationsChange(const QVector<ModelNode> &nodeLi
if
(
!
m_selectedNode
.
isValid
())
return
;
m_locked
=
true
;
if
(
nodeList
.
contains
(
m_selectedNode
))
m_currentType
->
m_backendAnchorBinding
.
setup
(
QmlItemNode
(
m_selectedNode
));
m_locked
=
false
;
}
void
PropertyEditor
::
nodeIdChanged
(
const
ModelNode
&
node
,
const
QString
&
newId
,
const
QString
&
oldId
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment