svn commit: r1886132 - /pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java

[rw...@apache.org]

Author: rwhitcomb
Date: Tue Feb  2 18:05:42 2021
New Revision: 1886132

URL: http://svn.apache.org/viewvc?rev=1886132&view=rev
Log:
Add styles to Form for "labelFont" and "messageFont".

Modified:
    pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java

Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java?rev=1886132&r1=1886131&r2=1886132&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java Tue Feb  2 18:05:42 2021
@@ -18,6 +18,7 @@ package org.apache.pivot.wtk.skin.terra;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.GeneralPath;
@@ -220,6 +221,7 @@ public class TerraFormSkin extends Conta
     private boolean showFlagMessagesInline;
     private boolean leftAlignLabels;
     private String delimiter;
+    private Font labelFont;
     private Image errorIcon = null;
     private Color errorMessageColor = null;
     private Color errorMessageBackgroundColor = null;
@@ -333,6 +335,10 @@ public class TerraFormSkin extends Conta
         // Get theme icons/colors
         TerraTheme theme = (TerraTheme) Theme.getTheme();
 
+        Font themeFont = theme.getFont();
+        labelFont = themeFont;
+        flagMessageLabel.getStyles().put(Style.font, themeFont);
+
         errorIcon = theme.getSmallMessageIcon(MessageType.ERROR);
         errorMessageColor = theme.getColor(4);
         errorMessageBackgroundColor = theme.getColor(22);
@@ -1067,6 +1073,61 @@ public class TerraFormSkin extends Conta
         setSeparatorHeadingColor(GraphicsUtilities.decodeColor(separatorHeadingColor, "separatorHeadingColor"));
     }
 
+    public final Font getLabelFont() {
+        return labelFont;
+    }
+
+    public final void setLabelFont(Font font) {
+        Utils.checkNull(font, "labelFont");
+
+        labelFont = font;
+
+        for (int sectionIndex = 0, sectionCount = sections.getLength(); sectionIndex < sectionCount; sectionIndex++) {
+            Form.Section section = sections.get(sectionIndex);
+
+            for (int fieldIndex = 0, fieldCount = section.getLength(); fieldIndex < fieldCount; fieldIndex++) {
+                Label label = labels.get(sectionIndex).get(fieldIndex);
+                label.getStyles().put(Style.font, labelFont);
+            }
+        }
+
+        invalidateComponent();
+    }
+
+    public final void setLabelFont(String fontString) {
+        Utils.checkNull(fontString, "labelFont");
+
+        setLabelFont(decodeFont(fontString));
+    }
+
+    public final void setLabelFont(Dictionary<String, ?> fontDict) {
+        Utils.checkNull(fontDict, "labelFont");
+
+        setLabelFont(Theme.deriveFont(fontDict));
+    }
+
+    public final Font getMessageFont() {
+        return flagMessageLabel.getStyles().getFont(Style.font);
+    }
+
+    public final void setMessageFont(Font font) {
+        Utils.checkNull(font, "messageFont");
+
+        flagMessageLabel.getStyles().put(Style.font, font);
+    }
+
+    public final void setMessageFont(String fontString) {
+        Utils.checkNull(fontString, "messageFont");
+
+        setMessageFont(decodeFont(fontString));
+    }
+
+    public final void setMessageFont(Dictionary<String, ?> fontDict) {
+        Utils.checkNull(fontDict, "messageFont");
+
+        setMessageFont(Theme.deriveFont(fontDict));
+    }
+
     // Form events
     @Override
     public void sectionInserted(Form form, int index) {
@@ -1165,6 +1226,7 @@ public class TerraFormSkin extends Conta
 
         // Create the label
         Label label = new Label();
+        label.getStyles().put(Style.font, labelFont);
         labels.get(sectionIndex).insert(label, index);
         form.add(label);