summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Rahn <rahn@kde.org>2016-11-14 00:28:14 (GMT)
committerTorsten Rahn <trahn@testo.de>2016-11-14 00:28:42 (GMT)
commit34b666e1b756a4b55a71c649207fd1705fe23192 (patch)
tree81b781064474dbc7a27561de019f7c16f9b97a40
parentf1a7db2fa7e635bba9a6517fede36c545d689c72 (diff)
Minor tweaks to the position marker.
-rw-r--r--src/apps/marble-maps/PositionMarker.qml9
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp4
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h4
3 files changed, 9 insertions, 8 deletions
diff --git a/src/apps/marble-maps/PositionMarker.qml b/src/apps/marble-maps/PositionMarker.qml
index 2efd026..452f4ea 100644
--- a/src/apps/marble-maps/PositionMarker.qml
+++ b/src/apps/marble-maps/PositionMarker.qml
@@ -54,8 +54,9 @@ Item {
}
Rectangle {
- visible: root.speed < 0.5
- width: Screen.pixelDensity * 4
+ id: circleIndicator
+ visible: root.speed < 0.4
+ width: Screen.pixelDensity * 3.5
height: width
anchors.centerIn: parent
radius: width/2
@@ -67,11 +68,11 @@ Item {
}
Image {
- id: image
+ id: arrowIndicator
width: Screen.pixelDensity * 6
height: width
anchors.centerIn: parent
- visible: root.speed >= 0.5
+ visible: root.speed >= 0.4
source: "qrc:///navigation_blue.svg"
sourceSize.width: width
sourceSize.height: height
diff --git a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
index 20bc476..c830e5f 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
@@ -162,7 +162,7 @@ void GeoLineStringGraphicsItem::paint(GeoPainter* painter, const ViewportParams*
}
}
-void GeoLineStringGraphicsItem::paintInline(GeoPainter* painter, const ViewportParams* viewport)
+void GeoLineStringGraphicsItem::paintInline(GeoPainter* painter, const ViewportParams* viewport) const
{
// qDebug() << Q_FUNC_INFO;
if ( ( !viewport->resolves( m_renderLineString->latLonAltBox(), 2) ) ) {
@@ -204,7 +204,7 @@ void GeoLineStringGraphicsItem::paintOutline(GeoPainter *painter, const Viewport
painter->restore();
}
-void GeoLineStringGraphicsItem::paintLabel(GeoPainter *painter, const ViewportParams *viewport)
+void GeoLineStringGraphicsItem::paintLabel(GeoPainter *painter, const ViewportParams *viewport) const
{
// qDebug() << Q_FUNC_INFO;
if ( ( !viewport->resolves( m_renderLineString->latLonAltBox(), 2) ) ) {
diff --git a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h
index ee41933..aff8007 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h
+++ b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h
@@ -38,8 +38,8 @@ public:
private:
void paintOutline(GeoPainter *painter, const ViewportParams *viewport);
- void paintInline(GeoPainter *painter, const ViewportParams *viewport);
- void paintLabel(GeoPainter *painter, const ViewportParams *viewport);
+ void paintInline(GeoPainter *painter, const ViewportParams *viewport) const;
+ void paintLabel(GeoPainter *painter, const ViewportParams *viewport) const;
bool configurePainterForOutline(GeoPainter* painter, const ViewportParams *viewport) const;
bool configurePainterForInline(GeoPainter* painter, const ViewportParams *viewport) const;
bool configurePainterForLabel(GeoPainter* painter, const ViewportParams *viewport, LabelPositionFlags &labelPositionFlags) const;