diff options
4 files changed, 5 insertions, 26 deletions
diff --git a/src/libs/tracing/qml/FlameGraphView.qml b/src/libs/tracing/qml/FlameGraphView.qml index 621569e8bb..f98bcb3134 100644 --- a/src/libs/tracing/qml/FlameGraphView.qml +++ b/src/libs/tracing/qml/FlameGraphView.qml @@ -45,7 +45,7 @@ ScrollView { function resetRoot() { flamegraph.resetRoot(); } property bool zoomed: flamegraph.zoomed - property int sizeRole: -1 + property var sizeRole: modes[Math.max(0, modesMenu.currentIndex)] property var model: null property int typeIdRole: -1 @@ -56,7 +56,7 @@ ScrollView { property int summaryRole: -1 property int noteRole: -1 - property var trRoleNames: [] + property var trRoleNames: ({}) property var modes: [] @@ -314,29 +314,11 @@ ScrollView { } } - Button { + ComboBox { + id: modesMenu x: flickable.width - width y: flickable.contentY - - // It won't listen to anchors.margins and by default it doesn't add any margin. Great. - width: implicitWidth + 20 - - text: qsTr("Visualize %1").arg(trRoleNames[root.sizeRole]) - onClicked: modesMenu.open() - - Menu { - id: modesMenu - y: parent.height - Instantiator { - model: root.modes - MenuItem { - text: root.trRoleNames[modelData] - onTriggered: root.sizeRole = modelData - } - onObjectAdded: modesMenu.insertItem(index, object) - onObjectRemoved: modesMenu.removeItem(object) - } - } + model: root.modes.map(function(role) { return root.trRoleNames[role] }); } } } diff --git a/src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml b/src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml index 689d233731..58677b311a 100644 --- a/src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml +++ b/src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml @@ -28,7 +28,6 @@ import "../tracing/" FlameGraphView { id: root - sizeRole: PerfProfilerFlameGraphModel.SamplesRole model: flameGraphModel diff --git a/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml b/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml index a734b011a2..1780dee7f2 100644 --- a/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml +++ b/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml @@ -30,7 +30,6 @@ FlameGraphView { id: root model: flameGraphModel - sizeRole: QmlProfilerFlameGraphModel.DurationRole typeIdRole: QmlProfilerFlameGraphModel.TypeIdRole sourceFileRole: QmlProfilerFlameGraphModel.FilenameRole diff --git a/tests/auto/tracing/flamegraphview/TestFlameGraphView.qml b/tests/auto/tracing/flamegraphview/TestFlameGraphView.qml index 3be69a445a..7324360b2a 100644 --- a/tests/auto/tracing/flamegraphview/TestFlameGraphView.qml +++ b/tests/auto/tracing/flamegraphview/TestFlameGraphView.qml @@ -28,7 +28,6 @@ import "../tracing/" FlameGraphView { id: root - sizeRole: TestFlameGraphModel.SizeRole model: flameGraphModel |