[Swingme-svn] SF.net SVN: swingme:[2440] SwingME/src/net/yura/mobile/gui

[<yu...@us...>]

Revision: 2440
          http://sourceforge.net/p/swingme/code/2440
Author:   yuranet
Date:     2021-04-26 11:11:31 +0000 (Mon, 26 Apr 2021)
Log Message:
-----------
show textfield hint

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/TextComponent.java
    SwingME/src/net/yura/mobile/gui/components/TextField.java
    SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java

Modified: SwingME/src/net/yura/mobile/gui/components/TextComponent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextComponent.java	2021-04-26 10:42:05 UTC (rev 2439)
+++ SwingME/src/net/yura/mobile/gui/components/TextComponent.java	2021-04-26 11:11:31 UTC (rev 2440)
@@ -90,7 +90,7 @@
         public static final int MODE_ABC = 2;
         public static final int MODE_123 = 3;
 
-	private String label="";
+	protected String label="";
 	private int constraints;
         private int mode;
 

Modified: SwingME/src/net/yura/mobile/gui/components/TextField.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextField.java	2021-04-26 10:42:05 UTC (rev 2439)
+++ SwingME/src/net/yura/mobile/gui/components/TextField.java	2021-04-26 11:11:31 UTC (rev 2440)
@@ -18,10 +18,10 @@
 package net.yura.mobile.gui.components;
 
 import javax.microedition.lcdui.Canvas;
-
 import net.yura.mobile.gui.ActionListener;
 import net.yura.mobile.gui.Graphics2D;
 import net.yura.mobile.gui.KeyEvent;
+import net.yura.mobile.gui.plaf.Style;
 import net.yura.mobile.logging.Logger;
 
 /**
@@ -56,19 +56,25 @@
          * @see TextArea#paintComponent(Graphics2D)
          */
     	public void paintComponent(Graphics2D g) {
-
                 int f = getForeground();
 
                 if (!Graphics2D.isTransparent(f)) { // we need to support transparent foreground as Swing does and we need it for android
 
-                    String textString = getDisplayString();
-
                     int[] oldClip = g.getClip();
                     g.clipRect(0, 0, width, height);
 
-                    g.setColor( f );
+                    String textString = getDisplayString();
+
+                    if ("".equals(textString) && label != null && !"".equals(label)) {
+                        setState(Style.DISABLED);
+                        f = getForeground();
+                        setState(-1);
+                        textString = label;
+                    }
+
+                    g.setColor(f);
                     g.setFont(font);
-                    g.drawString( textString, offset, (height-font.getHeight())/2 );
+                    g.drawString(textString, offset, (height-font.getHeight()) / 2);
 
                     if (showCaret) {
                         int x = font.getWidth(textString.substring(0, caretPosition));
@@ -94,7 +100,6 @@
         }
 
         public void setCaretPosition(int a) {
-
             super.setCaretPosition(a);
 
             if (isFocusOwner()) {
@@ -116,7 +121,6 @@
 
                 repaint();
             }
-
         }
 
         protected void workoutMinimumSize() {

Modified: SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2021-04-26 10:42:05 UTC (rev 2439)
+++ SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2021-04-26 11:11:31 UTC (rev 2440)
@@ -226,7 +226,7 @@
         setUIDefault("TextField[focused].border",new NimbusBorder(textareaFocusedSettings));
         //setUIDefault("TextField[selected].border",new NimbusBorder(textareaSelectedSettings));
         setUIDefault("TextField[disabled].border",new NimbusBorder(textareaDisabledSettings));
-        //setUIDefault("TextField.foreground",uiSettings.get("nimbusDisabledText"));
+        setUIDefault("TextField[disabled].foreground",uiSettings.get("nimbusDisabledText"));
 
         setUIDefault("TextArea.background", uiSettings.get("nimbusLightBackground"));
         // TODO: this doesn't work

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.