[Arianne-commits] stendhal/src/games/stendhal/client/gui/styled Style.java, 1.10, 1.11 StyledButtonUI.java, 1.3, 1.4 StyledSliderUI.java, 1.1, 1.2 WoodStyle.java, 1.13, 1.14

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

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

Modified Files:
	Style.java StyledButtonUI.java StyledSliderUI.java 
	WoodStyle.java 
Log Message:
Provide access to highlight and shadow colors in Style, and use them for buttons and sliders.


Index: StyledSliderUI.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/styled/StyledSliderUI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StyledSliderUI.java	9 Jun 2010 19:55:13 -0000	1.1
--- StyledSliderUI.java	10 Jun 2010 10:54:57 -0000	1.2
***************
*** 1,5 ****
  package games.stendhal.client.gui.styled;
  
- import java.awt.Color;
  import java.awt.Graphics;
  import java.awt.Point;
--- 1,4 ----
***************
*** 65,69 ****
  	@Override
  	public void paintFocus(Graphics g) {
! 		g.setColor(Color.GRAY);
  		Rectangle r = getThumbShape();
  		g.drawRect(r.x - 1, r.y, r.width + 1, r.height - 1);
--- 64,68 ----
  	@Override
  	public void paintFocus(Graphics g) {
! 		g.setColor(style.getHighLightColor());
  		Rectangle r = getThumbShape();
  		g.drawRect(r.x - 1, r.y, r.width + 1, r.height - 1);

Index: StyledButtonUI.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/styled/StyledButtonUI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StyledButtonUI.java	9 Jun 2010 19:53:59 -0000	1.3
--- StyledButtonUI.java	10 Jun 2010 10:54:57 -0000	1.4
***************
*** 1,5 ****
  package games.stendhal.client.gui.styled;
  
- import java.awt.Color;
  import java.awt.Graphics;
  import java.awt.Insets;
--- 1,4 ----
***************
*** 41,45 ****
  	protected void paintFocus(Graphics graphics, AbstractButton button, 
  			Rectangle viewRect, Rectangle textRect, Rectangle iconRect) {
! 		graphics.setColor(Color.GRAY);
  		graphics.drawRect(textRect.x, textRect.y, textRect.width, textRect.height);
  	}
--- 40,44 ----
  	protected void paintFocus(Graphics graphics, AbstractButton button, 
  			Rectangle viewRect, Rectangle textRect, Rectangle iconRect) {
! 		graphics.setColor(style.getShadowColor());
  		graphics.drawRect(textRect.x, textRect.y, textRect.width, textRect.height);
  	}
***************
*** 55,59 ****
  	
  	/**
! 	 * Draws the mouse focus hilighting
  	 * 
  	 * @param graphics
--- 54,58 ----
  	
  	/**
! 	 * Draws the mouse focus highlighting
  	 * 
  	 * @param graphics
***************
*** 61,65 ****
  	 */
  	private void hilite(Graphics graphics, JComponent button) {
! 		graphics.setColor(button.getForeground());
  		Insets insets = button.getInsets();
  		int width = button.getWidth() - insets.right - insets.left;
--- 60,64 ----
  	 */
  	private void hilite(Graphics graphics, JComponent button) {
! 		graphics.setColor(style.getHighLightColor());
  		Insets insets = button.getInsets();
  		int width = button.getWidth() - insets.right - insets.left;

Index: WoodStyle.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/styled/WoodStyle.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** WoodStyle.java	9 Jun 2010 12:34:27 -0000	1.13
--- WoodStyle.java	10 Jun 2010 10:54:57 -0000	1.14
***************
*** 24,27 ****
--- 24,29 ----
   */
  public class WoodStyle implements Style {
+ 	private static final Color highLightColor = new Color(0.6f, 0.5f, 0.2f);
+ 	private static final Color shadowColor = new Color(0.3f, 0.25f, 0.1f);
  
  	/**
***************
*** 56,63 ****
  		background = st.getSprite("data/gui/panelwood003.jpg");
  
! 		border = new SoftBevelBorder(BevelBorder.RAISED, new Color(0.6f, 0.5f,
! 				0.2f), new Color(0.3f, 0.25f, 0.1f));
! 		borderDown = new SoftBevelBorder(BevelBorder.LOWERED, new Color(0.6f, 0.5f,
! 				0.2f), new Color(0.3f, 0.25f, 0.1f));
  
  		font = new Font("Dialog", Font.PLAIN, 12);
--- 58,64 ----
  		background = st.getSprite("data/gui/panelwood003.jpg");
  
! 		border = new SoftBevelBorder(BevelBorder.RAISED, highLightColor, shadowColor);
! 		borderDown = new SoftBevelBorder(BevelBorder.LOWERED, highLightColor,
! 				shadowColor);
  
  		font = new Font("Dialog", Font.PLAIN, 12);
***************
*** 129,131 ****
--- 130,140 ----
  		return Color.white;
  	}
+ 
+ 	public Color getHighLightColor() {
+ 		return highLightColor;
+ 	}
+ 
+ 	public Color getShadowColor() {
+ 		return shadowColor;
+ 	}
  }

Index: Style.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/styled/Style.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Style.java	9 Jun 2010 12:34:27 -0000	1.10
--- Style.java	10 Jun 2010 10:54:57 -0000	1.11
***************
*** 56,58 ****
--- 56,72 ----
  	 */
  	Color getForeground();
+ 	
+ 	/**
+ 	 * Get a light color used for highlighting.
+ 	 *  
+ 	 * @return A color.
+ 	 */
+ 	Color getHighLightColor();
+ 	
+ 	/**
+ 	 * Get a dark color used for darkening.
+ 	 *  
+ 	 * @return A color.
+ 	 */
+ 	Color getShadowColor();
  }