diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 92fe17d6..ced6325e 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -1597,9 +1597,9 @@ void UBBoardView::drawBackground (QPainter *painter, const QRectF &rect) QColor bgCrossColor; if (darkBackground) - bgCrossColor = UBSettings::crossDarkBackground; + bgCrossColor = QColor(UBSettings::settings()->boardCrossColorDarkBackground->get().toString()); else - bgCrossColor = UBSettings::crossLightBackground; + bgCrossColor = QColor(UBSettings::settings()->boardCrossColorLightBackground->get().toString()); if (transform ().m11 () < 1.0) { diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 9f2c72fb..6a479a6f 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -71,9 +71,6 @@ const char *UBSettings::sDefaultFontFamily = "Arial"; QString UBSettings::currentFileVersion = "4.8.0"; -QColor UBSettings::crossDarkBackground = QColor(44, 44, 44, 200); -QColor UBSettings::crossLightBackground = QColor(165, 225, 255); - QBrush UBSettings::eraserBrushDarkBackground = QBrush(QColor(127, 127, 127, 80)); QBrush UBSettings::eraserBrushLightBackground = QBrush(QColor(255, 255, 255, 30)); @@ -272,6 +269,10 @@ void UBSettings::init() pageSize = new UBSetting(this, "Board", "DefaultPageSize", documentSizes.value(DocumentSizeRatio::Ratio4_3)); + + boardCrossColorDarkBackground = new UBSetting(this, "Board", "CrossColorDarkBackground", "#C82C2C2C"); + boardCrossColorLightBackground = new UBSetting(this, "Board", "CrossColorLightBackground", "#A5FFFF"); + QStringList penLightBackgroundColors; penLightBackgroundColors << "#000000" << "#FF0000" <<"#004080" << "#008000" << "#FFDD00" << "#C87400" << "#800040" << "#008080" << "#5F2D0A" << "#FFFFFF"; boardPenLightBackgroundColors = new UBColorListSetting(this, "Board", "PenLightBackgroundColors", penLightBackgroundColors, 1.0); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index 9d04f0dc..9f024d57 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -160,8 +160,6 @@ class UBSettings : public QObject static int pointerDiameter; static int boardMargin; - static QColor crossDarkBackground; - static QColor crossLightBackground; static QColor paletteColor; static QColor opaquePaletteColor; @@ -275,6 +273,9 @@ class UBSettings : public QObject UBSetting* featureSliderPosition; + UBSetting* boardCrossColorDarkBackground; + UBSetting* boardCrossColorLightBackground; + UBColorListSetting* boardPenLightBackgroundColors; UBColorListSetting* boardPenLightBackgroundSelectedColors; diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index deb6cbd5..357fb1a8 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -2391,9 +2391,9 @@ void UBGraphicsScene::drawBackground(QPainter *painter, const QRectF &rect) QColor bgCrossColor; if (darkBackground) - bgCrossColor = UBSettings::crossDarkBackground; + bgCrossColor = QColor(UBSettings::settings()->boardCrossColorDarkBackground->get().toString()); else - bgCrossColor = UBSettings::crossLightBackground; + bgCrossColor = QColor(UBSettings::settings()->boardCrossColorLightBackground->get().toString()); if (mZoomFactor < 1.0) { int alpha = 255 * mZoomFactor / 2;