From aa06737230927cd0c9cd32a9860d26e20c367797 Mon Sep 17 00:00:00 2001
From: ageofadz <ageofadz@protonmail.com>
Date: Sat, 23 Nov 2019 18:32:46 +0000
Subject: [PATCH] Dark mode fixes Edited dark theme scrollbar fix to dark.css
 to overwrite color -jr-scrollbar-thumb and -jr-scrollbar-track in dark.css.
 Switched base theme background for group selection number highlight back to
 green. Added dark theme to OO/Libreoffice style selection pane.

fixes #5646
---
 .../org/jabref/gui/openoffice/StyleSelectDialogView.java    | 6 ++----
 src/main/java/org/jabref/preferences/JabRefPreferences.java | 4 ++++
 .../java/org/jabref/preferences/PreferencesService.java     | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
index 9ff46b7d1f4..3ac1ba09e55 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -26,7 +26,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.JabRefPreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import org.fxmisc.easybind.EasyBind;
@@ -48,7 +47,6 @@ public class StyleSelectDialogView extends BaseDialog<OOBibStyle> {
     private StyleSelectDialogViewModel viewModel;
     private PreviewViewer previewArticle;
     private PreviewViewer previewBook;
-    JabRefPreferences prefs = JabRefPreferences.getInstance();
 
     public StyleSelectDialogView(StyleLoader loader) {
 
@@ -80,8 +78,8 @@ private void initialize() {
         previewBook.setEntry(TestEntry.getTestEntryBook());
         vbox.getChildren().add(previewBook);
 
-        previewArticle.setTheme(prefs.get(JabRefPreferences.FX_THEME));
-        previewBook.setTheme(prefs.get(JabRefPreferences.FX_THEME));
+        previewArticle.setTheme(preferencesService.getTheme());
+        previewBook.setTheme(preferencesService.getTheme());
 
         colName.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         colJournals.setCellValueFactory(cellData -> cellData.getValue().journalsProperty());
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 76e0c962e8b..b9de829621d 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -917,6 +917,10 @@ public String getUser() {
         }
     }
 
+   public String getTheme() {
+        return get(FX_THEME);
+    }
+
     /**
      * Get a Map of default tab names to deafult tab fields.
      * The fields are returned as a String with fields separated by ;
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index c9c79cd8b68..4946a19fcee 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -90,6 +90,8 @@ public interface PreferencesService {
 
     String getUser();
 
+    String getTheme();
+
     SaveOrderConfig loadExportSaveOrder();
 
     void storeExportSaveOrder(SaveOrderConfig config);