summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristiaan Janssen <christiaan.janssen@nokia.com>2011-11-29 12:32:35 +0100
committerChristiaan Janssen <christiaan.janssen@nokia.com>2011-12-05 10:10:40 +0100
commit1cd6972ac848633befcace396cf59c7f32d845ab (patch)
treee7aeb6c7e536289fa77167f8f259a67ef0f25953
parent7b9a42da151b49fc381f9444bffba403832ced32 (diff)
downloadqt-creator-1cd6972ac848633befcace396cf59c7f32d845ab.tar.gz
QmlProfiler: minor adjustments to timeline UI
Change-Id: I74460d9a32ced707fa4a550199bba5f5906f417e Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
-rw-r--r--src/plugins/qmlprofiler/qml/MainView.qml12
-rw-r--r--src/plugins/qmlprofiler/qml/TimeDisplay.qml4
-rw-r--r--src/plugins/qmlprofiler/qml/arrow_down.pngbin190 -> 250 bytes
-rw-r--r--src/plugins/qmlprofiler/qml/arrow_right.pngbin191 -> 246 bytes
-rw-r--r--src/plugins/qmlprofiler/timelineview.cpp3
5 files changed, 10 insertions, 9 deletions
diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml
index 7f04b79349..9afe23bc87 100644
--- a/src/plugins/qmlprofiler/qml/MainView.qml
+++ b/src/plugins/qmlprofiler/qml/MainView.qml
@@ -526,8 +526,8 @@ Rectangle {
width: parent.height
height: parent.width
gradient: Gradient {
- GradientStop { position: 0.0; color: "#00A0A0A0"; }
- GradientStop { position: 1.0; color: "#FFA0A0A0"; }
+ GradientStop { position: 0.0; color: "#00000000"; }
+ GradientStop { position: 1.0; color: "#86000000"; }
}
}
}
@@ -544,8 +544,8 @@ Rectangle {
width: parent.height
height: parent.width
gradient: Gradient {
- GradientStop { position: 0.0; color: "#FFA0A0A0"; }
- GradientStop { position: 1.0; color: "#00A0A0A0"; }
+ GradientStop { position: 0.0; color: "#86000000"; }
+ GradientStop { position: 1.0; color: "#00000000"; }
}
}
}
@@ -556,8 +556,8 @@ Rectangle {
width: root.width
x: 0
gradient: Gradient {
- GradientStop { position: 0.0; color: "#00A0A0A0"; }
- GradientStop { position: 1.0; color: "#FFA0A0A0"; }
+ GradientStop { position: 0.0; color: "#00000000"; }
+ GradientStop { position: 1.0; color: "#86000000"; }
}
}
}
diff --git a/src/plugins/qmlprofiler/qml/TimeDisplay.qml b/src/plugins/qmlprofiler/qml/TimeDisplay.qml
index 0efba45bdd..b3e4d099a2 100644
--- a/src/plugins/qmlprofiler/qml/TimeDisplay.qml
+++ b/src/plugins/qmlprofiler/qml/TimeDisplay.qml
@@ -105,8 +105,8 @@ Canvas2D {
ctxt.stroke();
// gradient borders
- var gradientDark = "rgba(160, 160, 160, 1)";
- var gradientClear = "rgba(160, 160, 160, 0)";
+ var gradientDark = "rgba(0, 0, 0, 0.53125)";
+ var gradientClear = "rgba(0, 0, 0, 0)";
var grad = ctxt.createLinearGradient(0, 0, 0, 6);
grad.addColorStop(0,gradientDark);
grad.addColorStop(1,gradientClear);
diff --git a/src/plugins/qmlprofiler/qml/arrow_down.png b/src/plugins/qmlprofiler/qml/arrow_down.png
index c1c5cd7d92..94300b5944 100644
--- a/src/plugins/qmlprofiler/qml/arrow_down.png
+++ b/src/plugins/qmlprofiler/qml/arrow_down.png
Binary files differ
diff --git a/src/plugins/qmlprofiler/qml/arrow_right.png b/src/plugins/qmlprofiler/qml/arrow_right.png
index 9b6c170f57..e124813da3 100644
--- a/src/plugins/qmlprofiler/qml/arrow_right.png
+++ b/src/plugins/qmlprofiler/qml/arrow_right.png
Binary files differ
diff --git a/src/plugins/qmlprofiler/timelineview.cpp b/src/plugins/qmlprofiler/timelineview.cpp
index 417105eb6e..0e6a30839b 100644
--- a/src/plugins/qmlprofiler/timelineview.cpp
+++ b/src/plugins/qmlprofiler/timelineview.cpp
@@ -161,6 +161,7 @@ void TimelineView::drawSelectionBoxes(QPainter *p)
selectionColor = QColor(96,0,255);
QPen strongPen(selectionColor, 3);
QPen lightPen(QBrush(selectionColor.lighter(130)), 2);
+ lightPen.setJoinStyle(Qt::MiterJoin);
p->setPen(lightPen);
int x, y, width, eventType;
@@ -183,7 +184,7 @@ void TimelineView::drawSelectionBoxes(QPainter *p)
width = 1;
if (i == m_selectedItem)
- selectedItemRect = QRect(x,y,width,DefaultRowHeight);
+ selectedItemRect = QRect(x, y-1, width, DefaultRowHeight+1);
else
p->drawRect(x,y,width,DefaultRowHeight);
}