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

QmlJS Live Preview: Fixed highlighting from text editor-> qml observer

Browse Source 
Now, the items about to be selected must inherit from QGraphicsObject.
Also, coding style was cleaned up a bit.
This commit is contained in:
Lasse Holmstedt
2010-07-27 11:57:06 +02:00
parent 689cbc06f1
commit cdb5dadfc2
4 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/qmljsinspector/qmljslivetextpreview.cpp
View File

@@ -211,36 +211,43 @@ void QmlJSLiveTextPreview::changeSelectedElements(QList<int> offsets, const QStr
ClientProxy *clientProxy = ClientProxy::instance();
QDeclarativeDebugObjectReference objectRefUnderCursor;
QList<QDeclarativeDebugObjectReference> refs = clientProxy->objectReferences();
foreach (const QDeclarativeDebugObjectReference &ref, refs) {
if (ref.idString() == wordAtCursor) {
objectRefUnderCursor = ref;
break;
if (!wordAtCursor.isEmpty() && wordAtCursor[0].isUpper()) {
QList<QDeclarativeDebugObjectReference> refs = clientProxy->objectReferences();
foreach (const QDeclarativeDebugObjectReference &ref, refs) {
if (ref.idString() == wordAtCursor) {
objectRefUnderCursor = ref;
break;
}
}
}
QList<int> selectedReferences;
bool containsReference = false;
bool containsReferenceUnderCursor = false;
foreach(int offset, offsets) {
if (offset >= 0) {
QList<int> list = objectReferencesForOffset(offset);
if (!containsReference && objectRefUnderCursor.debugId() != -1) {
if (!containsReferenceUnderCursor && objectRefUnderCursor.debugId() != -1) {
foreach(int id, list) {
if (id == objectRefUnderCursor.debugId()) {
containsReference = true;
containsReferenceUnderCursor = true;
break;
}
}
}
selectedReferences << list;
}
}
if (!containsReference && objectRefUnderCursor.debugId() != -1)
// fallback: use ref under cursor if nothing else is found
if (selectedReferences.isEmpty()
&& !containsReferenceUnderCursor
&& objectRefUnderCursor.debugId() != -1)
{
selectedReferences << objectRefUnderCursor.debugId();
}
if (!selectedReferences.isEmpty()) {
QList<QDeclarativeDebugObjectReference> refs;