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

Tracing: Use the same "lock" mechanism in flame graph as in timeline

Browse Source 
You can disable hover selection by "closing" the lock.

Task-number: QTCREATORBUG-19788
Change-Id: Ibfcbd17745b2928fd4951312770a673a2677d404
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2018-05-03 17:58:57 +02:00
parent def017e5cb
commit b6f5ec3559
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/tracing/qml/FlameGraphView.qml
View File

@@ -170,7 +170,7 @@ ScrollView {
borderColor: { borderColor: {
if (isSelected) if (isSelected)
return flamegraph.blue2; return flamegraph.blue2;
else if (tooltip.hoveredNode === flamegraphItem) else if (tooltip.currentNode === flamegraphItem)
return flamegraph.blue1; return flamegraph.blue1;
else if (note() !== "" || isHighlighted) else if (note() !== "" || isHighlighted)
return flamegraph.highlight; return flamegraph.highlight;
@@ -178,8 +178,7 @@ ScrollView {
return flamegraph.grey1; return flamegraph.grey1;
} }
borderWidth: { borderWidth: {
if (tooltip.hoveredNode === flamegraphItem || if (tooltip.currentNode === flamegraphItem) {
tooltip.selectedNode === flamegraphItem) {
return 2; return 2;
} else if (note() !== "" || isHighlighted) { } else if (note() !== "" || isHighlighted) {
return 3; return 3;
@@ -280,7 +279,7 @@ ScrollView {
property var selectedNode: null; property var selectedNode: null;
property var currentNode: { property var currentNode: {
if (hoveredNode !== null) if (!locked && hoveredNode !== null)
return hoveredNode; return hoveredNode;
else if (selectedNode !== null) else if (selectedNode !== null)
return selectedNode; return selectedNode;

4
src/libs/tracing/qml/MainView.qml
View File

@@ -371,8 +371,8 @@ Rectangle {
content.select(selectedModel, selectedItem) content.select(selectedModel, selectedItem)
} }
onToggleSelectionLocked: { onLockedChanged: {
content.selectionLocked = !content.selectionLocked; content.selectionLocked = locked;
} }
onClearSelection: { onClearSelection: {

3
src/libs/tracing/qml/RangeDetails.qml
View File

@@ -54,7 +54,6 @@ Item {
property alias noteReadonly: noteEdit.readOnly property alias noteReadonly: noteEdit.readOnly
signal recenterOnItem signal recenterOnItem
signal toggleSelectionLocked
signal clearSelection signal clearSelection
signal updateNote(string text) signal updateNote(string text)
@@ -117,7 +116,7 @@ Item {
anchors.top: closeIcon.top anchors.top: closeIcon.top
anchors.right: closeIcon.left anchors.right: closeIcon.left
implicitHeight: typeTitle.height implicitHeight: typeTitle.height
onClicked: rangeDetails.toggleSelectionLocked() onClicked: locked = !locked
} }
ImageToolButton { ImageToolButton {