From 91f534e152997582a3576278c3a86b48cf5bd95b Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Fri, 23 Sep 2016 19:43:06 -0400 Subject: [PATCH] Fixed marker preview circle color --- src/core/UBSettings.cpp | 4 ++-- src/domain/UBGraphicsScene.cpp | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index c344908a..9f2c72fb 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -80,8 +80,8 @@ QBrush UBSettings::eraserBrushLightBackground = QBrush(QColor(255, 255, 255, 30) QPen UBSettings::eraserPenDarkBackground = QPen(QColor(255, 255, 255, 127)); QPen UBSettings::eraserPenLightBackground = QPen(QColor(0, 0, 0, 127)); -QColor UBSettings::markerCircleBrushColorDarkBackground = QColor(127, 127, 127, 0); -QColor UBSettings::markerCircleBrushColorLightBackground = QColor(255, 255, 255, 0); +QColor UBSettings::markerCircleBrushColorDarkBackground = QColor(127, 127, 127, 80); +QColor UBSettings::markerCircleBrushColorLightBackground = QColor(255, 255, 255, 30); QColor UBSettings::markerCirclePenColorDarkBackground = QColor(255, 255, 255, 127); QColor UBSettings::markerCirclePenColorLightBackground = QColor(0, 0, 0, 127); diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 5181af4a..deb6cbd5 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -2608,20 +2608,19 @@ void UBGraphicsScene::updateMarkerCircleColor() if (!mMarkerCircle) return; - QBrush mcBrush = mMarkerCircle->brush(); QPen mcPen = mMarkerCircle->pen(); if (mDarkBackground) { - mcBrush.setColor(UBSettings::markerCircleBrushColorDarkBackground); mcPen.setColor(UBSettings::markerCirclePenColorDarkBackground); + mMarkerCircle->setBrush(UBSettings::markerCircleBrushColorDarkBackground); } else { - mcBrush.setColor(UBSettings::markerCircleBrushColorLightBackground); mcPen.setColor(UBSettings::markerCirclePenColorLightBackground); + mMarkerCircle->setBrush(UBSettings::markerCircleBrushColorLightBackground); } - mMarkerCircle->setBrush(mcBrush); + mcPen.setStyle(Qt::DotLine); mMarkerCircle->setPen(mcPen); }