From 87e4edffa573115b26d1e62f7a134164b049c343 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <aksdb@gmx.de>
Date: Sat, 12 Mar 2011 17:56:53 +0100
Subject: [PATCH] - Fixed display of the current hue in the Draw settings
 dialog

---
 Client/Tools/UfrmDrawSettings.lfm | 47 ++++++++++++++++---------------
 Client/Tools/UfrmDrawSettings.pas | 18 ++++++++----
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/Client/Tools/UfrmDrawSettings.lfm b/Client/Tools/UfrmDrawSettings.lfm
index 591409a..4b47e24 100644
--- a/Client/Tools/UfrmDrawSettings.lfm
+++ b/Client/Tools/UfrmDrawSettings.lfm
@@ -1,40 +1,39 @@
 inherited frmDrawSettings: TfrmDrawSettings
   Left = 268
-  Height = 180
+  Height = 166
   Top = 165
   Width = 242
   ActiveControl = rbTileList
   Caption = 'Draw settings'
-  ClientHeight = 180
+  ClientHeight = 166
   ClientWidth = 242
   OnCreate = FormCreate
   object rbTileList: TRadioButton[0]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 8
-    Height = 22
+    Height = 19
     Top = 8
-    Width = 146
+    Width = 125
     BorderSpacing.Left = 8
     BorderSpacing.Top = 8
     BorderSpacing.Bottom = 4
     Caption = 'Use tile from the list'
     Checked = True
-    State = cbChecked
     TabOrder = 0
+    TabStop = True
   end
   object rbRandom: TRadioButton[1]
     AnchorSideLeft.Control = rbTileList
     AnchorSideTop.Control = rbTileList
     AnchorSideTop.Side = asrBottom
     Left = 8
-    Height = 22
-    Top = 34
-    Width = 213
+    Height = 19
+    Top = 31
+    Width = 184
     BorderSpacing.Top = 4
     Caption = 'Use tiles from the random pool'
     TabOrder = 1
-    TabStop = False
   end
   object gbHue: TGroupBox[2]
     AnchorSideLeft.Control = Owner
@@ -43,25 +42,27 @@ inherited frmDrawSettings: TfrmDrawSettings
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 8
-    Height = 49
-    Top = 132
+    Height = 38
+    Top = 122
     Width = 226
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Around = 8
     Caption = 'Hue (Statics only)'
-    ClientHeight = 45
+    ClientHeight = 20
     ClientWidth = 222
     TabOrder = 2
     object pbHue: TPaintBox
       Cursor = crHandPoint
       Left = 4
-      Height = 41
+      Height = 16
       Top = 0
       Width = 214
       Align = alClient
       BorderSpacing.Left = 4
       BorderSpacing.Right = 4
       BorderSpacing.Bottom = 4
+      Font.Height = 14
+      ParentFont = False
       OnClick = pbHueClick
       OnPaint = pbHuePaint
     end
@@ -71,9 +72,9 @@ inherited frmDrawSettings: TfrmDrawSettings
     AnchorSideTop.Control = cbForceAltitude
     AnchorSideTop.Side = asrBottom
     Left = 8
-    Height = 22
-    Top = 102
-    Width = 149
+    Height = 19
+    Top = 93
+    Width = 135
     BorderSpacing.Top = 12
     Caption = 'Add Random Altitude'
     TabOrder = 3
@@ -84,8 +85,8 @@ inherited frmDrawSettings: TfrmDrawSettings
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 184
-    Height = 21
-    Top = 103
+    Height = 23
+    Top = 91
     Width = 50
     Anchors = [akTop, akRight]
     BorderSpacing.Right = 8
@@ -96,9 +97,9 @@ inherited frmDrawSettings: TfrmDrawSettings
     AnchorSideTop.Control = rbRandom
     AnchorSideTop.Side = asrBottom
     Left = 8
-    Height = 22
-    Top = 68
-    Width = 111
+    Height = 19
+    Top = 62
+    Width = 95
     BorderSpacing.Top = 12
     Caption = 'Force altitude:'
     TabOrder = 5
@@ -109,8 +110,8 @@ inherited frmDrawSettings: TfrmDrawSettings
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 184
-    Height = 21
-    Top = 69
+    Height = 23
+    Top = 60
     Width = 50
     Anchors = [akTop, akRight]
     BorderSpacing.Right = 8
diff --git a/Client/Tools/UfrmDrawSettings.pas b/Client/Tools/UfrmDrawSettings.pas
index 05183ac..9537a56 100644
--- a/Client/Tools/UfrmDrawSettings.pas
+++ b/Client/Tools/UfrmDrawSettings.pas
@@ -87,12 +87,18 @@ var
 begin
   if frmHueSettings <> nil then
   begin
-    if frmHueSettings.lbHue.ItemIndex > 0 then
-      hue := ResMan.Hue.Hues[frmHueSettings.lbHue.ItemIndex - 1]
-    else
-      hue := nil;
-    TfrmHueSettings.DrawHue(hue, pbHue.Canvas, pbHue.Canvas.ClipRect,
-      frmHueSettings.lbHue.Items.Strings[frmHueSettings.lbHue.ItemIndex]);
+    if frmHueSettings.cbRandom.Checked then
+    begin
+      pbHue.Canvas.TextOut(36, 1, '[Random]');
+    end else
+    begin
+      if frmHueSettings.lbHue.ItemIndex > 0 then
+        hue := ResMan.Hue.Hues[frmHueSettings.lbHue.ItemIndex - 1]
+      else
+        hue := nil;
+      TfrmHueSettings.DrawHue(hue, pbHue.Canvas, pbHue.Canvas.ClipRect,
+        frmHueSettings.lbHue.Items.Strings[frmHueSettings.lbHue.ItemIndex]);
+    end;
   end;
 end;