diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-08-04 11:11:54 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-08-05 14:29:36 +0000 |
| commit | 2cc261a1843585759362e8f89716fa5d0d1166ed (patch) | |
| tree | 3558ca92001b1a2b9a3bd689902f5ce7faec08db /src/plugins/qmlprofiler/qml | |
| parent | 8448f412ecc219d670e32eeb0002cf706f5aeb57 (diff) | |
QmlProfiler: Use timeline theme also for flame graph
Flame graph and timeline are similar in visual appearance, so they can
share theme settings.
Change-Id: I2e078fd8aa55d3b21e31abc82b967093623a2ab3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/qmlprofiler/qml')
| -rw-r--r-- | src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml b/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml index 1fe10a230f2..6ab8af2ef35 100644 --- a/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml +++ b/src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml @@ -67,7 +67,7 @@ ScrollView { property color blue2: Qt.rgba(0.375, 0, 1, 1) property color grey1: "#B0B0B0" property color grey2: "#A0A0A0" - property color orange: "orange" + property color highlight: creatorTheme.Timeline_HighlightColor function checkBindingLoop(otherTypeId) {return false;} @@ -97,7 +97,7 @@ ScrollView { else if (tooltip.hoveredNode === flamegraphItem) return flamegraph.blue1; else if (note() !== "" || isBindingLoop) - return flamegraph.orange; + return flamegraph.highlight; else return flamegraph.grey1; } @@ -239,6 +239,15 @@ ScrollView { minimumY: flickable.contentY maximumY: flickable.contentY + flickable.height + titleBarColor: creatorTheme.Timeline_PanelHeaderColor + titleBarTextColor: creatorTheme.PanelTextColorLight + contentColor: creatorTheme.Timeline_PanelBackgroundColor + contentTextColor: creatorTheme.Timeline_TextColor + noteTextColor: creatorTheme.Timeline_HighlightColor + buttonHoveredColor: creatorTheme.FancyToolButtonHoverColor + buttonSelectedColor: creatorTheme.FancyToolButtonSelectedColor + borderWidth: 0 + property var hoveredNode: null; property var selectedNode: null; |