From e55993c9143e7e88afc8a42a2f7195b9799985f6 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Thu, 28 Feb 2019 01:47:46 +0700 Subject: [PATCH] Fix various Dark Mode issues --- source/net/filebot/platform/windows/WinAppUtilities.java | 4 ++-- source/net/filebot/ui/MainFrame.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/net/filebot/platform/windows/WinAppUtilities.java b/source/net/filebot/platform/windows/WinAppUtilities.java index a7f5e9c8..6345f8e7 100644 --- a/source/net/filebot/platform/windows/WinAppUtilities.java +++ b/source/net/filebot/platform/windows/WinAppUtilities.java @@ -2,8 +2,8 @@ package net.filebot.platform.windows; import static javax.swing.BorderFactory.*; import static net.filebot.Logging.*; +import static net.filebot.ui.ThemeSupport.*; -import java.awt.Color; import java.util.logging.Level; import javax.swing.UIManager; @@ -74,7 +74,7 @@ public class WinAppUtilities { } // improved UI defaults - UIManager.put("TitledBorder.border", createCompoundBorder(createLineBorder(new Color(0xD7D7D7), 1, true), createCompoundBorder(createMatteBorder(6, 5, 6, 5, new Color(0xE5E5E5)), createEmptyBorder(0, 2, 0, 2)))); + UIManager.put("TitledBorder.border", createCompoundBorder(createLineBorder(getColor(0xD7D7D7), 1, true), createCompoundBorder(createMatteBorder(6, 5, 6, 5, getColor(0xE5E5E5)), createEmptyBorder(0, 2, 0, 2)))); } private WinAppUtilities() { diff --git a/source/net/filebot/ui/MainFrame.java b/source/net/filebot/ui/MainFrame.java index 5a43498c..5f274e80 100644 --- a/source/net/filebot/ui/MainFrame.java +++ b/source/net/filebot/ui/MainFrame.java @@ -8,6 +8,7 @@ import static javax.swing.KeyStroke.*; import static javax.swing.ScrollPaneConstants.*; import static net.filebot.Logging.*; import static net.filebot.Settings.*; +import static net.filebot.ui.ThemeSupport.*; import static net.filebot.util.ui.SwingUI.*; import java.awt.Color; @@ -61,7 +62,7 @@ public class MainFrame extends JFrame { JScrollPane selectionListScrollPane = new JScrollPane(selectionList, VERTICAL_SCROLLBAR_NEVER, HORIZONTAL_SCROLLBAR_NEVER); selectionListScrollPane.setOpaque(false); - selectionListScrollPane.setBorder(createCompoundBorder(new ShadowBorder(), isMacApp() ? createLineBorder(new Color(0x809DB8), 1, false) : selectionListScrollPane.getBorder())); + selectionListScrollPane.setBorder(createCompoundBorder(new ShadowBorder(), isMacApp() ? createLineBorder(getColor(0x809DB8), 1, false) : selectionListScrollPane.getBorder())); headerPanel.getTitleLabel().setBorder(createEmptyBorder(8, 90, 10, 0));