[dotgnu-pnet-commits] pnetlib ./ChangeLog System.Windows.Forms/TextBo...

[Heiko Weiss]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnetlib
Branch:         
Changes by:     Heiko Weiss <address@hidden>    06/03/20 06:11:14

Modified files:
        .              : ChangeLog 
        System.Windows.Forms: TextBox.cs ControlPaint.cs 

Log message:
        TextBox.cs : always draw disabled textbox with gray, if backcolor not 
gray
        ControlPaint.cs: fixed bug in calculating color FromHSB

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/ChangeLog.diff?tr1=1.2370&tr2=1.2371&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Windows.Forms/TextBox.cs.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Windows.Forms/ControlPaint.cs.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: pnetlib/ChangeLog
diff -u pnetlib/ChangeLog:1.2370 pnetlib/ChangeLog:1.2371
--- pnetlib/ChangeLog:1.2370    Thu Mar 16 07:22:48 2006
+++ pnetlib/ChangeLog   Mon Mar 20 06:11:14 2006
@@ -1,3 +1,8 @@
+2006-03-20  Peter Flaig  <address@hidden>
+
+       * System.Windows.Forms/TextBox.cs : always draw disabled textbox with 
gray, if backcolor not gray
+       * System.Windows.Forms/ControlPaint.cs: fixed bug in calculating color 
FromHSB
+
 2006-03-16  Heiko Weiss  <address@hidden>
 
        * System.Windows.Form/ScrollableControl.cs : replaced setting 
EventHandler HandleCreated with OnHandleCreated
Index: pnetlib/System.Windows.Forms/ControlPaint.cs
diff -u pnetlib/System.Windows.Forms/ControlPaint.cs:1.17 
pnetlib/System.Windows.Forms/ControlPaint.cs:1.18
--- pnetlib/System.Windows.Forms/ControlPaint.cs:1.17   Sat Aug 13 03:20:13 2005
+++ pnetlib/System.Windows.Forms/ControlPaint.cs        Mon Mar 20 06:11:14 2006
@@ -65,8 +65,6 @@
 
                                float temp1 = 2.0f * brightness - temp2;
                                float t1 = hue + 120.0f;
-                               if (t1 > 360.0)
-                                       t1 -= 360.0f;
                                float t2 = hue;
                                float t3 = hue - 120.0f;
                                if (t3 < 0)
Index: pnetlib/System.Windows.Forms/TextBox.cs
diff -u pnetlib/System.Windows.Forms/TextBox.cs:1.50 
pnetlib/System.Windows.Forms/TextBox.cs:1.51
--- pnetlib/System.Windows.Forms/TextBox.cs:1.50        Wed Nov 16 06:56:23 2005
+++ pnetlib/System.Windows.Forms/TextBox.cs     Mon Mar 20 06:11:14 2006
@@ -1416,7 +1416,7 @@
                int x = 0;
                int y = int.MinValue;
                int i;
-               using (Brush foreBrush = new SolidBrush(ForeColor), 
selectedForeBrush = new SolidBrush(SystemColors.HighlightText))
+               using (SolidBrush foreBrush = new SolidBrush(ForeColor), 
selectedForeBrush = new SolidBrush(SystemColors.HighlightText))
                {
                        int cleanI = 0;
                        for (i=0; i < text.Length;i++) 
@@ -1482,7 +1482,9 @@
                                                        }
                                                        else
                                                        {
-                                                               
ControlPaint.DrawStringDisabled(g, lineText, font, BackColor, new Rectangle(x, 
y, bounds.Width, bounds.Height), StringFormat.GenericDefault);
+                                                               if(BackColor != 
Color.Gray)
+                                                                       
foreBrush.Color = Color.Gray;
+                                                               
g.DrawString(lineText, Font, foreBrush, new Point (x, y));
                                                        }
                                                }
                                                lineStart = i;
@@ -1513,7 +1515,9 @@
                                }
                                else
                                {
-                                       ControlPaint.DrawStringDisabled(g, 
lineText, font, BackColor, new Rectangle(x, y, Bounds.Width, Bounds.Height), 
StringFormat.GenericDefault);
+                                       if(BackColor != Color.Gray)
+                                               foreBrush.Color = Color.Gray;
+                                       g.DrawString(lineText, Font, foreBrush, 
new Point (x, y));
                                }
                        }
                }