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

QtQuickToolBar: disable gradient editing in PropertyChanges

Browse Source 
Editing gradients in PropertyChanges is not allowed.

Task-number: QTCREATORBUG-2969
This commit is contained in:
Thomas Hartmann
2011-03-10 13:05:23 +01:00
parent 2731f42e8d
commit 402daade93
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmljseditor/quicktoolbar.cpp
View File

@@ -147,6 +147,8 @@ void QuickToolBar::apply(TextEditor::BaseTextEditor *editor, Document::Ptr docum
const Interpreter::ObjectValue *scopeObject = document->bind()->findQmlObject(node);
bool isPropertyChanges = false;
if (!lookupContext.isNull() && scopeObject) {
m_prototypes.clear();
foreach (const Interpreter::ObjectValue *object,
@@ -155,6 +157,7 @@ void QuickToolBar::apply(TextEditor::BaseTextEditor *editor, Document::Ptr docum
}
if (m_prototypes.contains("PropertyChanges")) {
isPropertyChanges = true;
const Interpreter::ObjectValue *targetObject = getPropertyChangesTarget(node, lookupContext);
m_prototypes.clear();
if (targetObject) {
@@ -230,7 +233,9 @@ void QuickToolBar::apply(TextEditor::BaseTextEditor *editor, Document::Ptr docum
offset = QPoint(400 - reg.boundingRect().width() + 10 ,0);
QPoint p3 = editor->editorWidget()->mapToParent(editor->editorWidget()->viewport()->mapToParent(reg.boundingRect().topRight()) + offset);
p2.setX(p1.x());
contextWidget()->setType(m_prototypes);
contextWidget()->setIsPropertyChanges(isPropertyChanges);
if (!update)
contextWidget()->setType(m_prototypes);
if (!update)
contextWidget()->activate(p3 , p1, p2, QuickToolBarSettings::get().pinContextPane);
else