From 9a137848d3f8d234dd6e9f14f21d124b5939a480 Mon Sep 17 00:00:00 2001

From: Evgeniy Kukhtinov <neurofreak@altlinux.org>

Date: Tue, 11 Oct 2022 10:05:21 +0300

Subject: [PATCH 02/10] dark-background-color-set-ability-feature

---

 resources/etc/OpenBoard.config       | 1 +

 src/board/UBBoardView.cpp            | 2 +-

 src/core/UBPreferencesController.cpp | 4 ++--

 src/core/UBSettings.cpp              | 2 ++

 src/core/UBSettings.h                | 2 ++

 src/domain/UBGraphicsScene.cpp       | 2 +-

 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/resources/etc/OpenBoard.config b/resources/etc/OpenBoard.config

index edf8a85..74dfcd2 100644

--- a/resources/etc/OpenBoard.config

+++ b/resources/etc/OpenBoard.config

@@ -26,6 +26,7 @@ UseSystemOnScreenKeyboard=true

 [Board]

 AutoSaveIntervalInMinutes=3

+ColorDarkBackground=#000000

 CrossColorDarkBackground=#C8C0C0C0

 CrossColorLightBackground=#A5E1FF

 DarkBackground=0

diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp

index 95d5ed7..bfd8e0e 100644

--- a/src/board/UBBoardView.cpp

+++ b/src/board/UBBoardView.cpp

@@ -1659,7 +1659,7 @@ void UBBoardView::drawBackground (QPainter *painter, const QRectF &rect)

     if (darkBackground)

     {

-        painter->fillRect (rect, QBrush (QColor (Qt::black)));

+        painter->fillRect (rect, QBrush (QColor (UBSettings::settings()->boardColorDarkBackground->get().toString())));

     }

     else

     {

diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp

index c1ee661..6a46c7f 100644

--- a/src/core/UBPreferencesController.cpp

+++ b/src/core/UBPreferencesController.cpp

@@ -180,7 +180,7 @@ void UBPreferencesController::wire()

     mPreferencesUI->crossColorLightBackgroundFrame->setPalette(lightBackgroundPalette);

     QPalette darkBackgroundPalette = QApplication::palette();

-    darkBackgroundPalette.setColor(QPalette::Window, Qt::black);

+    darkBackgroundPalette.setColor(QPalette::Window, QColor(UBSettings::settings()->boardColorDarkBackground->get().toString()));

     darkBackgroundPalette.setColor(QPalette::ButtonText, Qt::white);

     darkBackgroundPalette.setColor(QPalette::WindowText, Qt::white);

@@ -688,7 +688,7 @@ UBBrushPropertiesFrame::UBBrushPropertiesFrame(QFrame* owner, const QList<QColor

     lightBackgroundFrame->setPalette(lightBackgroundPalette);

     QPalette darkBackgroundPalette = QApplication::palette();

-    darkBackgroundPalette.setColor(QPalette::Window, Qt::black);

+    darkBackgroundPalette.setColor(QPalette::Window, QColor(UBSettings::settings()->boardColorDarkBackground->get().toString()));

     darkBackgroundPalette.setColor(QPalette::ButtonText, Qt::white);

     darkBackgroundPalette.setColor(QPalette::WindowText, Qt::white);

diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp

index b51d47c..d90b722 100644

--- a/src/core/UBSettings.cpp

+++ b/src/core/UBSettings.cpp

@@ -295,6 +295,8 @@ void UBSettings::init()

     pageSize = new UBSetting(this, "Board", "DefaultPageSize", documentSizes.value(DocumentSizeRatio::Ratio4_3));

+    boardColorDarkBackground = new UBSetting(this, "Board", "ColorDarkBackground", "#000000");

+

     boardCrossColorDarkBackground = new UBSetting(this, "Board", "CrossColorDarkBackground", "#C8C0C0C0");

     boardCrossColorLightBackground = new UBSetting(this, "Board", "CrossColorLightBackground", "#A5E1FF");

diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h

index c6e0f22..67cf6f2 100644

--- a/src/core/UBSettings.h

+++ b/src/core/UBSettings.h

@@ -300,6 +300,8 @@ class UBSettings : public QObject

         UBSetting* featureSliderPosition;

+        UBSetting* boardColorDarkBackground;

+

         UBSetting* boardCrossColorDarkBackground;

         UBSetting* boardCrossColorLightBackground;

diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp

index 0b95a11..a86f657 100644

--- a/src/domain/UBGraphicsScene.cpp

+++ b/src/domain/UBGraphicsScene.cpp

@@ -2701,7 +2701,7 @@ void UBGraphicsScene::drawBackground(QPainter *painter, const QRectF &rect)

     if (darkBackground)

     {

-      painter->fillRect (rect, QBrush (QColor (Qt::black)));

+      painter->fillRect (rect, QBrush (QColor (UBSettings::settings()->boardColorDarkBackground->get().toString())));

     }

     else

     {

-- 

2.25.4