You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/10/05 19:17:44 UTC
svn commit: r821927 - in /incubator/pivot/trunk:
demos/src/org/apache/pivot/demos/dnd/
demos/src/org/apache/pivot/demos/roweditor/
tutorials/src/org/apache/pivot/tutorials/
tutorials/src/org/apache/pivot/tutorials/databinding/
tutorials/src/org/apache/...
Author: gbrown
Date: Mon Oct 5 17:17:43 2009
New Revision: 821927
URL: http://svn.apache.org/viewvc?rev=821927&view=rev
Log:
Eliminate fontBold, fontItalic, and fontSize styles and replace with new JSON-based font encoding.
Modified:
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.wtkx
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/demo.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calendars.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/data_binding.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/file_browser_sheets.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/kitchen_sink.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/box_panes.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/flow_panes.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menu_buttons.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/meters.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/payment.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/rollups.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/shipping.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/summary.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/weather.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/spinners.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.detail.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tables.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/trees.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ResultItemRenderer.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Text.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/terra_alert_skin.wtkx
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/terra_prompt_skin.wtkx
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/sample_drawing.wtkd
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/demo.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/demo.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calendars.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calendars.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/data_binding.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/data_binding.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/file_browser_sheets.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/file_browser_sheets.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/kitchen_sink.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/kitchen_sink.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/box_panes.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/box_panes.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/flow_panes.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/flow_panes.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menu_buttons.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menu_buttons.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/meters.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/meters.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/payment.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/payment.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/rollups.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/rollups.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/shipping.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/shipping.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/summary.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/summary.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/weather.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/weather.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/spinners.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/spinners.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.detail.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.detail.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tables.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tables.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/trees.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/trees.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ResultItemRenderer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ResultItemRenderer.java?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ResultItemRenderer.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ResultItemRenderer.java Mon Oct 5 17:17:43 2009
@@ -70,8 +70,7 @@
}
Font font = (Font)listView.getStyles().get("font");
- titleLabel.getStyles().put("font", font);
- titleLabel.getStyles().put("fontBold", true);
+ titleLabel.getStyles().put("font", font.deriveFont(font.getStyle() | Font.BOLD));
phoneLabel.getStyles().put("font", font);
addressLabel.getStyles().put("font", font);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Text.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Text.java?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Text.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Text.java Mon Oct 5 17:17:43 2009
@@ -30,8 +30,10 @@
import java.text.AttributedString;
import org.apache.pivot.collections.ArrayList;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.ListenerList;
import org.apache.pivot.wtk.Bounds;
+import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.HorizontalAlignment;
import org.apache.pivot.wtk.Platform;
@@ -116,46 +118,18 @@
public final void setFont(String font) {
if (font == null) {
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
}
- public int getFontSize() {
- return font.getSize();
- }
-
- public final void setFontSize(int fontSize) {
- setFont(font.deriveFont((float)fontSize));
- }
-
- public boolean isFontBold() {
- return ((font.getStyle() & Font.BOLD) == Font.BOLD);
- }
-
- public final void setFontBold(boolean fontBold) {
- if (isFontBold() != fontBold) {
- if (fontBold) {
- setFont(font.deriveFont(Font.BOLD));
- } else {
- setFont(font.deriveFont(font.getStyle() & (~Font.BOLD)));
- }
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
}
- }
- public boolean isFontItalic() {
- return ((font.getStyle() & Font.ITALIC) == Font.ITALIC);
- }
-
- public final void setFontItalic(boolean fontItalic) {
- if (isFontItalic() != fontItalic) {
- if (fontItalic) {
- setFont(font.deriveFont(Font.ITALIC));
- } else {
- setFont(font.deriveFont(font.getStyle() & (~Font.ITALIC)));
- }
- }
+ setFont(GraphicsUtilities.decodeFont(font));
}
public int getWidth() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java Mon Oct 5 17:17:43 2009
@@ -344,42 +344,6 @@
setFont(GraphicsUtilities.decodeFont(font));
}
- public int getFontSize() {
- return font.getSize();
- }
-
- public void setFontSize(int fontSize) {
- font = font.deriveFont((float)fontSize);
- }
-
- public boolean isFontBold() {
- return ((font.getStyle() & Font.BOLD) == Font.BOLD);
- }
-
- public void setFontBold(boolean fontBold) {
- int fontStyle = font.getStyle();
-
- if (fontBold) {
- font = font.deriveFont(fontStyle | Font.BOLD);
- } else {
- font = font.deriveFont(fontStyle & (~Font.BOLD));
- }
- }
-
- public boolean isFontItalic() {
- return ((font.getStyle() & Font.ITALIC) == Font.ITALIC);
- }
-
- public void setFontItalic(boolean fontItalic) {
- int fontStyle = font.getStyle();
-
- if (fontItalic) {
- font = font.deriveFont(fontStyle | Font.ITALIC);
- } else {
- font = font.deriveFont(fontStyle & (~Font.ITALIC));
- }
- }
-
public Color getColor() {
return color;
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java Mon Oct 5 17:17:43 2009
@@ -456,9 +456,13 @@
// Add the day labels
calendarRow = new TablePane.Row();
+
+ Font labelFont = theme.getFont();
+ labelFont = labelFont.deriveFont(Font.BOLD);
+
for (int i = 0; i < 7; i++) {
Label label = new Label();
- label.getStyles().put("fontBold", true);
+ label.getStyles().put("font", labelFont);
label.getStyles().put("padding", new Insets(2, 2, 4, 2));
label.getStyles().put("horizontalAlignment", HorizontalAlignment.CENTER);
calendarRow.add(label);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java Mon Oct 5 17:17:43 2009
@@ -241,7 +241,9 @@
titleRow.add(buttonBoxPane);
titleLabel.getStyles().put("color", theme.getColor(15));
- titleLabel.getStyles().put("fontBold", true);
+
+ Font titleFont = theme.getFont().deriveFont(Font.BOLD);
+ titleLabel.getStyles().put("font", titleFont);
titleBoxPane.add(titleLabel);
// Listen for click events on the title bar
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java Mon Oct 5 17:17:43 2009
@@ -18,6 +18,7 @@
import java.awt.BasicStroke;
import java.awt.Color;
+import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
@@ -273,7 +274,8 @@
titleBoxPane.getStyles().put("verticalAlignment", VerticalAlignment.CENTER);
titleBoxPane.getStyles().put("padding", new Insets(0, 0, 0, 2));
- titleLabel.getStyles().put("fontBold", true);
+ Font titleFont = theme.getFont().deriveFont(Font.BOLD);
+ titleLabel.getStyles().put("font", titleFont);
iconImageView.setPreferredSize(16, 16);
iconImageView.getStyles().put("fill", true);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java Mon Oct 5 17:17:43 2009
@@ -186,9 +186,9 @@
titleBoxPane.add(titleLabel);
titleBoxPane.getStyles().put("padding", new Insets(0, 0, 0, 3));
- Font font = theme.getFont();
- titleLabel.getStyles().put("fontBold", true);
- titleLabel.getStyles().put("fontSize", Math.round(font.getSize2D() * 0.8f));
+ Font titleFont = theme.getFont();
+ titleFont = titleFont.deriveFont(Math.round(titleFont.getSize2D() * 0.8f), Font.BOLD);
+ titleLabel.getStyles().put("font", titleFont);
titleLabel.getStyles().put("color", titleBarColor);
// Initialize the button box pane
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java Mon Oct 5 17:17:43 2009
@@ -262,21 +262,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
}
- public boolean isFontBold() {
- return ((font.getStyle() & Font.BOLD) == Font.BOLD);
- }
-
- public void setFontBold(boolean fontBold) {
- if (isFontBold() != fontBold) {
- if (fontBold) {
- font = font.deriveFont(Font.BOLD);
- } else {
- font = font.deriveFont(font.getStyle() & (~Font.BOLD));
- }
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
}
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/terra_alert_skin.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/terra_alert_skin.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/terra_prompt_skin.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/terra_prompt_skin.wtkx?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/sample_drawing.wtkd
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/sample_drawing.wtkd?rev=821927&r1=821926&r2=821927&view=diff
==============================================================================
Binary files - no diff available.