[Arianne-commits] stendhal/src/games/stendhal/client/gui/styled WoodStyle.java, 1.18, 1.19

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/styled
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28245/src/games/stendhal/client/gui/styled

Modified Files:
	WoodStyle.java 
Log Message:
Use user font size preference for the default font


Index: WoodStyle.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/styled/WoodStyle.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** WoodStyle.java	16 Jan 2011 12:01:42 -0000	1.18
--- WoodStyle.java	1 Dec 2012 10:15:45 -0000	1.19
***************
*** 1,5 ****
  /* $Id$ */
  /***************************************************************************
!  *                   (C) Copyright 2003-2010 - Stendhal                    *
   ***************************************************************************
   ***************************************************************************
--- 1,5 ----
  /* $Id$ */
  /***************************************************************************
!  *                   (C) Copyright 2003-2012 - Stendhal                    *
   ***************************************************************************
   ***************************************************************************
***************
*** 14,19 ****
--- 14,22 ----
  
  
+ import games.stendhal.client.gui.wt.core.SettingChangeAdapter;
+ import games.stendhal.client.gui.wt.core.WtWindowManager;
  import games.stendhal.client.sprite.Sprite;
  import games.stendhal.client.sprite.SpriteStore;
+ import games.stendhal.common.MathHelper;
  
  import java.awt.Color;
***************
*** 26,29 ****
--- 29,34 ----
   */
  public class WoodStyle implements Style {
+ 	private static final int DEFAULT_FONT_SIZE = 12;
+ 	
  	private static final Color highLightColor = new Color(163, 120, 97);
  	private static final Color shadowColor = new Color(50, 25, 12);
***************
*** 38,57 ****
  	 * The background texture.
  	 */
! 	protected Sprite background;
  
  	/**
  	 * The border.
  	 */
! 	protected Border border;
  	/**
! 	 * Downwards border (for buttons etc)
  	 */
! 	protected Border borderDown;
  
  	/**
  	 * The default font.
  	 */
! 	protected Font font;
  
  	public WoodStyle() {
  		/*
--- 43,65 ----
  	 * The background texture.
  	 */
! 	private Sprite background;
  
  	/**
  	 * The border.
  	 */
! 	private Border border;
  	/**
! 	 * Downwards border (for buttons etc).
  	 */
! 	private Border borderDown;
  
  	/**
  	 * The default font.
  	 */
! 	private Font font;
  
+ 	/**
+ 	 * Create new WoodStyle.
+ 	 */
  	public WoodStyle() {
  		/*
***************
*** 64,68 ****
  		borderDown = new PixmapBorder(background, false);
  
! 		font = new Font("Dialog", Font.PLAIN, 12);
  	}
  
--- 72,83 ----
  		borderDown = new PixmapBorder(background, false);
  
! 		WtWindowManager.getInstance().registerSettingChangeListener("ui.font_size", 
! 				new SettingChangeAdapter("ui.font_size", Integer.toString(DEFAULT_FONT_SIZE)) {
! 			@Override
! 			public void changed(String newValue) {
! 				int size = MathHelper.parseIntDefault(newValue, DEFAULT_FONT_SIZE);
! 				font = new Font("Dialog", Font.PLAIN, size);
! 			}
! 		});
  	}
  
***************
*** 93,96 ****
--- 108,112 ----
  	 * @return A texture sprite.
  	 */
+ 	@Override
  	public Sprite getBackground() {
  		return background;
***************
*** 102,105 ****
--- 118,122 ----
  	 * @return A border, or <code>null</code> to use default.
  	 */
+ 	@Override
  	public Border getBorder() {
  		return border;
***************
*** 111,114 ****
--- 128,132 ----
  	 * @return A border, or <code>null</code> to use default.
  	 */
+ 	@Override
  	public Border getBorderDown() {
  		return borderDown;
***************
*** 120,123 ****
--- 138,142 ----
  	 * @return A font.
  	 */
+ 	@Override
  	public Font getFont() {
  		return font;
***************
*** 129,140 ****
--- 148,162 ----
  	 * @return A color.
  	 */
+ 	@Override
  	public Color getForeground() {
  		return Color.white;
  	}
  
+ 	@Override
  	public Color getHighLightColor() {
  		return highLightColor;
  	}
  
+ 	@Override
  	public Color getShadowColor() {
  		return shadowColor;
***************
*** 146,149 ****
--- 168,172 ----
  	 * @return plain color
  	 */
+ 	@Override
  	public Color getPlainColor() {
  		return plainColor;