Skip to content

Commit 5cd452a

Browse files
committed
Slightly shift default outline back toward black
Original commit shifted it a bit too light
1 parent cd24adb commit 5cd452a

6 files changed

+9
-9
lines changed

src/core/symbology/qgsellipsesymbollayer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
QgsEllipseSymbolLayer::QgsEllipseSymbolLayer()
3131
: mSymbolName( QStringLiteral( "circle" ) )
32-
, mStrokeColor( QColor( 70, 70, 70 ) )
32+
, mStrokeColor( QColor( 35, 35, 35 ) )
3333
{
3434
mColor = Qt::white;
3535
mPen.setColor( mStrokeColor );

src/core/symbology/qgsfillsymbollayer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,7 @@ QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QString &svgFilePath, double
17121712
mStrokeWidth = 0.3;
17131713
mAngle = angle;
17141714
mColor = QColor( 255, 255, 255 );
1715-
mSvgStrokeColor = QColor( 70, 70, 70 );
1715+
mSvgStrokeColor = QColor( 35, 35, 35 );
17161716
mSvgStrokeWidth = 0.2;
17171717
setDefaultSvgParams();
17181718
mSvgPattern = nullptr;
@@ -1729,7 +1729,7 @@ QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QByteArray &svgData, double
17291729
mStrokeWidth = 0.3;
17301730
mAngle = angle;
17311731
mColor = QColor( 255, 255, 255 );
1732-
mSvgStrokeColor = QColor( 70, 70, 70 );
1732+
mSvgStrokeColor = QColor( 35, 35, 35 );
17331733
mSvgStrokeWidth = 0.2;
17341734
setSubSymbol( new QgsLineSymbol() );
17351735
setDefaultSvgParams();

src/core/symbology/qgsfillsymbollayer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#define DEFAULT_SIMPLEFILL_COLOR QColor(0,0,255)
2424
#define DEFAULT_SIMPLEFILL_STYLE Qt::SolidPattern
25-
#define DEFAULT_SIMPLEFILL_BORDERCOLOR QColor( 70, 70, 70 )
25+
#define DEFAULT_SIMPLEFILL_BORDERCOLOR QColor( 35, 35, 35 )
2626
#define DEFAULT_SIMPLEFILL_BORDERSTYLE Qt::SolidLine
2727
#define DEFAULT_SIMPLEFILL_BORDERWIDTH DEFAULT_LINE_WIDTH
2828
#define DEFAULT_SIMPLEFILL_JOINSTYLE Qt::BevelJoin

src/core/symbology/qgslinesymbollayer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
class QgsExpression;
2727

28-
#define DEFAULT_SIMPLELINE_COLOR QColor(70,70,70)
28+
#define DEFAULT_SIMPLELINE_COLOR QColor(35,35,35)
2929
#define DEFAULT_SIMPLELINE_WIDTH DEFAULT_LINE_WIDTH
3030
#define DEFAULT_SIMPLELINE_PENSTYLE Qt::SolidLine
3131
#define DEFAULT_SIMPLELINE_JOINSTYLE Qt::BevelJoin

src/core/symbology/qgsmarkersymbollayer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1698,8 +1698,8 @@ QgsSvgMarkerSymbolLayer::QgsSvgMarkerSymbolLayer( const QString &path, double si
16981698
mScaleMethod = scaleMethod;
16991699
mStrokeWidth = 0.2;
17001700
mStrokeWidthUnit = QgsUnitTypes::RenderMillimeters;
1701-
mColor = QColor( 70, 70, 70 );
1702-
mStrokeColor = QColor( 70, 70, 70 );
1701+
mColor = QColor( 35, 35, 35 );
1702+
mStrokeColor = QColor( 35, 35, 35 );
17031703
updateDefaultAspectRatio();
17041704
}
17051705

src/core/symbology/qgsmarkersymbollayer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#define DEFAULT_SIMPLEMARKER_NAME "circle"
2525
#define DEFAULT_SIMPLEMARKER_COLOR QColor(255,0,0)
26-
#define DEFAULT_SIMPLEMARKER_BORDERCOLOR QColor( 70, 70, 70 )
26+
#define DEFAULT_SIMPLEMARKER_BORDERCOLOR QColor( 35, 35, 35 )
2727
#define DEFAULT_SIMPLEMARKER_JOINSTYLE Qt::BevelJoin
2828
#define DEFAULT_SIMPLEMARKER_SIZE DEFAULT_POINT_SIZE
2929
#define DEFAULT_SIMPLEMARKER_ANGLE 0
@@ -650,7 +650,7 @@ class CORE_EXPORT QgsSvgMarkerSymbolLayer : public QgsMarkerSymbolLayer
650650
#define DEFAULT_FONTMARKER_FONT "Dingbats"
651651
#define DEFAULT_FONTMARKER_CHR QChar('A')
652652
#define DEFAULT_FONTMARKER_SIZE POINT2MM(12)
653-
#define DEFAULT_FONTMARKER_COLOR QColor( 70, 70, 70 )
653+
#define DEFAULT_FONTMARKER_COLOR QColor( 35, 35, 35 )
654654
#define DEFAULT_FONTMARKER_BORDERCOLOR QColor(Qt::white)
655655
#define DEFAULT_FONTMARKER_JOINSTYLE Qt::MiterJoin
656656
#define DEFAULT_FONTMARKER_ANGLE 0

0 commit comments

Comments
 (0)