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

[rwhitcomb]

Author: rwhitcomb
Date: Tue Feb  2 19:04:32 2021
New Revision: 1886138

URL: http://svn.apache.org/viewvc?rev=1886138&view=rev
Log:
Finish code in TerraFormSkin to implement message and label fonts. Fix some 
style errors.

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=1886138&r1=1886137&r2=1886138&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 19:04:32 2021
@@ -57,11 +57,14 @@ import org.apache.pivot.wtk.skin.Contain
  * change (make this configurable via a style flag)
  */
 public class TerraFormSkin extends ContainerSkin implements FormListener, 
FormAttributeListener {
+/**
+ * The decorator for the popup flags.
+ */
 private class PopupFieldIndicatorDecorator implements Decorator {
 private Graphics2D graphics = null;
 
 @Override
-public Graphics2D prepare(Component component, Graphics2D 
graphicsArgument) {
+public Graphics2D prepare(final Component component, final Graphics2D 
graphicsArgument) {
 this.graphics = graphicsArgument;
 return graphicsArgument;
 }
@@ -87,22 +90,25 @@ public class TerraFormSkin extends Conta
 }
 
 @Override
-public Bounds getBounds(Component component) {
+public Bounds getBounds(final Component component) {
 return new Bounds(POPUP_FIELD_INDICATOR_OFFSET, 
-POPUP_FIELD_INDICATOR_HEIGHT,
 POPUP_FIELD_INDICATOR_WIDTH, POPUP_FIELD_INDICATOR_HEIGHT);
 }
 
 @Override
-public AffineTransform getTransform(Component component) {
+public AffineTransform getTransform(final Component component) {
 return new AffineTransform();
 }
 }
 
+/**
+ * Decorator for the inline flags.
+ */
 private class InlineFlagMessageDecorator implements Decorator {
 private Graphics2D graphics = null;
 
 @Override
-public Graphics2D prepare(Component component, Graphics2D 
graphicsArgument) {
+public Graphics2D prepare(final Component component, final Graphics2D 
graphicsArgument) {
 this.graphics = graphicsArgument;
 return graphicsArgument;
 }
@@ -110,7 +116,7 @@ public class TerraFormSkin extends Conta
 @Override
 public void update() {
 if (showFlagMessagesInline) {
-Form form = (Form) getComponent();
+Form form = getForm();
 Form.SectionSequence sections = form.getSections();
 
 for (int sectionIndex = 0, sectionCount = 
sections.getLength(); sectionIndex < sectionCount;
@@ -195,12 +201,12 @@ public class TerraFormSkin extends Conta
 }
 
 @Override
-public Bounds getBounds(Component component) {
+public Bounds getBounds(final Component component) {
 return new Bounds(0, 0, component.getWidth(), 
component.getHeight());
 }
 
 @Override
-public AffineTransform getTransform(Component component) {
+public AffineTransform getTransform(final Component component) {
 return new AffineTransform();
 }
 }
@@ -245,7 +251,7 @@ public class TerraFormSkin extends Conta
 
 private ComponentMouseListener fieldMouseListener = new 
ComponentMouseListener() {
 @Override
-public void mouseOver(Component component) {
+public void mouseOver(final Component component) {
 if (!showFlagMessagesInline) {
 Form.Flag flag = Form.getFlag(component);
 
@@ -304,7 +310,7 @@ public class TerraFormSkin extends Conta
 }
 
 @Override
-public void mouseOut(Component component) {
+public void mouseOut(final Component component) {
 flagMessageWindow.close();
 }
 };
@@ -380,7 +386,7 @@ public class TerraFormSkin extends Conta
 private ApplicationContext.ScheduledCallback 
scheduledHideFlagMessageCallback = null;
 
 @Override
-public void windowOpened(Window window) {
+public void windowOpened(final Window window) {
 // Set a timer to hide the message
 Runnable hideFlagMessageCallback = new Runnable() {
 @Override
@@ -394,14 +400,18 @@ public class TerraFormSkin extends Conta
 }
 
 @Override
-public void windowClosed(Window window, Display display, Window 
owner) {
+public void windowClosed(final Window window, final Display 
display, final Window owner) 

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

[rwhitcomb]

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 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 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);