Update to use theme text colour for caretForeground

mikera · mikera · commit ce6da51028a3 · 2020-03-10T08:29:57.000+08:00
diff --git a/src/main/java/mdlaf/MaterialLookAndFeel.java b/src/main/java/mdlaf/MaterialLookAndFeel.java
@@ -469,6 +469,9 @@ protected void initComponentDefaults(UIDefaults table) {
 		table.put("TextArea.selectionForeground", theme.getSelectionForegroundTextField());
 		table.put("TextArea.foreground", theme.getTextColor());
 		table.put("TextArea.font", theme.getFontBold());
+		table.put("TextArea.caretForeground", theme.getTextColor());
+		
+		table.put("TextPane.caretForeground", theme.getTextColor());
 
 		table.put("ToggleButton.border", BorderFactory.createEmptyBorder());
 		table.put("ToggleButton.font", theme.getFontRegular());
@@ -536,6 +539,7 @@ protected void initComponentDefaults(UIDefaults table) {
 		table.put("EditorPane.selectionBackground", theme.getSelectionBackgroundTextField());
 		table.put("EditorPane.inactiveForeground", theme.getSelectionForegroundTextField());
 		table.put("EditorPane.font", theme.getFontRegular());
+		table.put("EditorPane.caretForeground", theme.getTextColor());
 		table.put("EditorPane.focusInputMap", multilineInputMap);
 
 		table.put("Separator.background", theme.getBackgroundSeparator());
@@ -558,7 +562,8 @@ protected void initComponentDefaults(UIDefaults table) {
 		table.put("TextField[Line].activeColor", theme.getActiveColorLineTextField());
 		table.put("TextField.border", theme.getBorderTextField());
 		table.put("TextField.focusInputMap", fieldInputMap);
-
+		table.put("TextField.caretForeground", theme.getTextColor());
+		
 		table.put("PasswordField.background", theme.getBackgroundTextField());
 		table.put("PasswordField.foreground", theme.getTextColor());
 		table.put("PasswordField.disabledBackground", theme.getDisabledBackgroudnTextField());
@@ -572,7 +577,8 @@ protected void initComponentDefaults(UIDefaults table) {
 		table.put("PasswordField.border", theme.getBorderTextField());
 		table.put("PasswordField.echoChar", theme.getEchoCharPasswordField());
 		table.put("PasswordField.focusInputMap", fieldInputMap);
-
+		table.put("PasswordField.caretForeground", theme.getTextColor());
+		
 		table.put("TitledBorder.border", theme.getBorderTitledBorder());
 		table.put("TitledBorder.font", theme.getFontMedium());
 		table.put("TitledBorder.titleColor", theme.getColorTextTitledBorder());
@@ -597,6 +603,7 @@ protected void initComponentDefaults(UIDefaults table) {
 		table.put("FormattedTextField.selectionBackground", theme.getSelectionBackgroundTextField());
 		table.put("FormattedTextField.selectionForeground", theme.getSelectionForegroundTextField());
 		table.put("FormattedTextField.border", theme.getBorderTextField());
+		table.put("FormattedTextField.caretForeground", theme.getTextColor());
 
 		table.put("List.background", theme.getBackgroundPrimary());
 		table.put("List.foreground", theme.getTextColor());
diff --git a/src/main/java/mdlaf/themes/MaterialOceanicTheme.java b/src/main/java/mdlaf/themes/MaterialOceanicTheme.java
@@ -239,11 +239,6 @@ protected void installColor() {
     @Override
     public void installUIDefault(UIDefaults table) {
         super.installUIDefault(table);
-        
-        table.put("TextField.caretForeground", Color.WHITE);
-        table.put("TextArea.caretForeground", Color.WHITE);
-        table.put("TextPane.caretForeground", Color.WHITE);
-        table.put("PasswordField.caretForeground", Color.WHITE);
     }
 
     @Override
