Re: FYI: Default implementation for Toolkit.loadSystemColors()

[Mark Wielaard]

On Fri, 2004-05-14 at 22:07, Mark Wielaard wrote:
> Hi,
> 
> Got a complaint from Stephane (of Odonata fame) that our
> Toolkit.loadSystemColors() didn't do anything. [...]
>
> 2004-05-14  Mark Wielaard  <address@hidden>
> 
>        * java/awt/Toolkit.java (loadSystemColors): Implement.
> 
> I just used the default colors described in the java class library book
> for SystemColor. Obviously a real toolkit should override this method
> and provide values that integrate with the native GUI platform.
> [...]
> +    systemColors[SystemColor.ACTIVE_CAPTION] = 0xFF00008;

Stephane spotted a missing digit in the above (actually he complained
that the color was completely wrong). This was actually a misprint in
the book I was using. This patch fixes it and lines the values out so it
is easier to spot similar errors.

2004-05-16  Mark Wielaard  <address@hidden>

        * java/awt/Toolkit.java (loadSystemColors): Make ACTIVE_CAPTION color
        0xFF000080. Line out values.

With this Odonata seems to works very nicely.
Committed.

Cheers,

Mark

--- java/awt/Toolkit.java       14 May 2004 20:07:54 -0000      1.24
+++ java/awt/Toolkit.java       16 May 2004 09:45:19 -0000
@@ -380,32 +380,32 @@
    */
   protected void loadSystemColors(int systemColors[])
   {
-    systemColors[SystemColor.DESKTOP] = 0xFF005C5C;
-    systemColors[SystemColor.ACTIVE_CAPTION] = 0xFF00008;
-    systemColors[SystemColor.ACTIVE_CAPTION_TEXT] = 0xFFFFFFFF;
-    systemColors[SystemColor.ACTIVE_CAPTION_BORDER] = 0xFFC0C0C0;
-    systemColors[SystemColor.INACTIVE_CAPTION] = 0xFF808080;
-    systemColors[SystemColor.INACTIVE_CAPTION_TEXT] = 0xFFC0C0C0;
+    systemColors[SystemColor.DESKTOP]                 = 0xFF005C5C;
+    systemColors[SystemColor.ACTIVE_CAPTION]          = 0xFF000080;
+    systemColors[SystemColor.ACTIVE_CAPTION_TEXT]     = 0xFFFFFFFF;
+    systemColors[SystemColor.ACTIVE_CAPTION_BORDER]   = 0xFFC0C0C0;
+    systemColors[SystemColor.INACTIVE_CAPTION]        = 0xFF808080;
+    systemColors[SystemColor.INACTIVE_CAPTION_TEXT]   = 0xFFC0C0C0;
     systemColors[SystemColor.INACTIVE_CAPTION_BORDER] = 0xFFC0C0C0;
-    systemColors[SystemColor.WINDOW] = 0xFFFFFFFF;
-    systemColors[SystemColor.WINDOW_BORDER] = 0xFF000000;
-    systemColors[SystemColor.WINDOW_TEXT] = 0xFF000000;
-    systemColors[SystemColor.MENU] = 0xFFC0C0C0;
-    systemColors[SystemColor.MENU_TEXT] = 0xFF000000;
-    systemColors[SystemColor.TEXT] = 0xFFC0C0C0;
-    systemColors[SystemColor.TEXT_TEXT] = 0xFF000000;
-    systemColors[SystemColor.TEXT_HIGHLIGHT] = 0xFF000090;
-    systemColors[SystemColor.TEXT_HIGHLIGHT_TEXT] = 0xFFFFFFFF;
-    systemColors[SystemColor.TEXT_INACTIVE_TEXT] = 0xFF808080;
-    systemColors[SystemColor.CONTROL] = 0xFFC0C0C0;
-    systemColors[SystemColor.CONTROL_TEXT] = 0xFF000000;
-    systemColors[SystemColor.CONTROL_HIGHLIGHT] = 0xFFFFFFFF;
-    systemColors[SystemColor.CONTROL_LT_HIGHLIGHT] = 0xFFE0E0E0;
-    systemColors[SystemColor.CONTROL_SHADOW] = 0xFF808080;
-    systemColors[SystemColor.CONTROL_DK_SHADOW] = 0xFF000000;
-    systemColors[SystemColor.SCROLLBAR] = 0xFFE0E0E0;
-    systemColors[SystemColor.INFO] = 0xFFE0E000;
-    systemColors[SystemColor.INFO_TEXT] = 0xFF000000;
+    systemColors[SystemColor.WINDOW]                  = 0xFFFFFFFF;
+    systemColors[SystemColor.WINDOW_BORDER]           = 0xFF000000;
+    systemColors[SystemColor.WINDOW_TEXT]             = 0xFF000000;
+    systemColors[SystemColor.MENU]                    = 0xFFC0C0C0;
+    systemColors[SystemColor.MENU_TEXT]               = 0xFF000000;
+    systemColors[SystemColor.TEXT]                    = 0xFFC0C0C0;
+    systemColors[SystemColor.TEXT_TEXT]               = 0xFF000000;
+    systemColors[SystemColor.TEXT_HIGHLIGHT]          = 0xFF000090;
+    systemColors[SystemColor.TEXT_HIGHLIGHT_TEXT]     = 0xFFFFFFFF;
+    systemColors[SystemColor.TEXT_INACTIVE_TEXT]      = 0xFF808080;
+    systemColors[SystemColor.CONTROL]                 = 0xFFC0C0C0;
+    systemColors[SystemColor.CONTROL_TEXT]            = 0xFF000000;
+    systemColors[SystemColor.CONTROL_HIGHLIGHT]       = 0xFFFFFFFF;
+    systemColors[SystemColor.CONTROL_LT_HIGHLIGHT]    = 0xFFE0E0E0;
+    systemColors[SystemColor.CONTROL_SHADOW]          = 0xFF808080;
+    systemColors[SystemColor.CONTROL_DK_SHADOW]       = 0xFF000000;
+    systemColors[SystemColor.SCROLLBAR]               = 0xFFE0E0E0;
+    systemColors[SystemColor.INFO]                    = 0xFFE0E000;
+    systemColors[SystemColor.INFO_TEXT]               = 0xFF000000;
   }
  
   /**

signature.asc
Description: This is a digitally signed message part