Fix caret colour for Oceanic theme

mikera · mikera · commit 88cd0bbdb348 · 2020-03-08T09:54:40.000+08:00
diff --git a/src/main/java/mdlaf/components/textfield/MaterialComponentField.java b/src/main/java/mdlaf/components/textfield/MaterialComponentField.java
@@ -96,6 +96,8 @@ protected void installMyDefaults(JComponent component) {
         textComponent.setSelectedTextColor(getComponent().hasFocus() && getComponent().isEnabled() ? activeForeground : inactiveForeground);
         textComponent.setForeground(getComponent().hasFocus() && getComponent().isEnabled() ? activeForeground : inactiveForeground);
         textComponent.setBorder(UIManager.getBorder(getPropertyPrefix() + ".border"));
+        textComponent.setCaretColor(UIManager.getColor(getPropertyPrefix() + ".caretForeground"));
+
     }
 
     protected void logicForPropertyChange(Color newColor, boolean isForeground){
diff --git a/src/main/java/mdlaf/themes/MaterialOceanicTheme.java b/src/main/java/mdlaf/themes/MaterialOceanicTheme.java
@@ -209,6 +209,11 @@ public void installUIDefault(UIDefaults table) {
         table.put("TabbedPane[contentBorder].enableLeaf", false);
         table.put("TabbedPane[contentBorder].enableRight", false);
         table.put("TabbedPane[contentBorder].enableBottom", false);
+        
+        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

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,8 @@ protected void installMyDefaults(JComponent component) {`
`96`	`96`	`textComponent.setSelectedTextColor(getComponent().hasFocus() && getComponent().isEnabled() ? activeForeground : inactiveForeground);`
`97`	`97`	`textComponent.setForeground(getComponent().hasFocus() && getComponent().isEnabled() ? activeForeground : inactiveForeground);`
`98`	`98`	`textComponent.setBorder(UIManager.getBorder(getPropertyPrefix() + ".border"));`
	`99`	`+ textComponent.setCaretColor(UIManager.getColor(getPropertyPrefix() + ".caretForeground"));`
	`100`	`+`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`protected void logicForPropertyChange(Color newColor, boolean isForeground){`