mbColorLib: Delphi support removed. Change version number to 2.1 (standard even/odd numbering scheme).

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5549 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/mbColorLib/GColorPicker.pas

@@ -1,29 +1,26 @@
 unit GColorPicker;
 
-{$IFDEF FPC}{$MODE DELPHI}{$ENDIF}
+{$IFDEF FPC}
+  {$MODE DELPHI}
+{$ENDIF}
 
 interface
 
 uses
-  {$IFDEF FPC}
-  LCLIntf, LCLType, LMessages,
-  {$ELSE}
-  Windows, Messages,
-  {$ENDIF}
-  SysUtils, Classes, Controls, Graphics, Forms,
-  mbTrackBarPicker, HTMLColors;
+  LCLIntf, LCLType, LMessages, SysUtils, Classes, Controls, Graphics, Forms,
+  HTMLColors, mbTrackBarPicker;
 
 type
   TGColorPicker = class(TmbTrackBarPicker)
   private
     FRed, FGreen, FBlue: integer;
     function ArrowPosFromGreen(g: integer): integer;
-    function GreenFromArrowPos(p: integer): integer;
     function GetSelectedColor: TColor;
-    procedure SetSelectedColor(c: TColor);
-    procedure SetRed(r: integer);
-    procedure SetGreen(g: integer);
+    function GreenFromArrowPos(p: integer): integer;
     procedure SetBlue(b: integer);
+    procedure SetGreen(g: integer);
+    procedure SetRed(r: integer);
+    procedure SetSelectedColor(c: TColor);
   protected
     procedure Execute(tbaAction: integer); override;
     function GetArrowPos: integer; override;
@@ -39,6 +36,7 @@ type
     property Layout default lyVertical;
   end;
 
+
 implementation
 
 uses
@@ -63,50 +61,6 @@ begin
   FChange := true;
 end;
 
-function TGColorPicker.GetGradientColor(AValue: Integer): TColor;
-begin
-  Result := RGB(FRed, AValue, FBlue);
-end;
-
-procedure TGColorPicker.SetRed(r: integer);
-begin
-  Clamp(r, 0, 255);
-  if FRed <> r then
-  begin
-    FRed := r;
-    FManual := false;
-    CreateGradient;
-    Invalidate;
-    if FChange and Assigned(OnChange) then OnChange(Self);
-  end;
-end;
-
-procedure TGColorPicker.SetGreen(g: integer);
-begin
-  Clamp(g, 0, 255);
-  if FGreen <> g then
-  begin
-    FGreen := g;
-    FArrowPos := ArrowPosFromGreen(g);
-    FManual := false;
-    Invalidate;
-    if FChange and Assigned(OnChange) then OnChange(Self);
-  end;
-end;
-
-procedure TGColorPicker.SetBlue(b: integer);
-begin
-  Clamp(b, 0, 255);
-  if FBlue <> b then
-  begin
-    FBlue := b;
-    FManual := false;
-    CreateGradient;
-    Invalidate;
-    if FChange and Assigned(OnChange) then OnChange(Self);
-  end;
-end;
-
 function TGColorPicker.ArrowPosFromGreen(g: integer): integer;
 var
   a: integer;
@@ -126,48 +80,6 @@ begin
   Result := a;
 end;
 
-function TGColorPicker.GreenFromArrowPos(p: integer): integer;
-var
-  g: integer;
-begin
-  if Layout = lyHorizontal then
-    g := Round(p/((Width - 12)/255))
-  else
-    g := Round(255 - p/((Height - 12)/255));
-  Clamp(g, 0, 255);
-  Result := g;
-end;
-
-function TGColorPicker.GetSelectedColor: TColor;
-begin
-  if not WebSafe then
-    Result := RGB(FRed, FGreen, FBlue)
-  else
-    Result := GetWebSafe(RGB(FRed, FGreen, FBlue));
-end;
-
-function TGColorPicker.GetSelectedValue: integer;
-begin
-  Result := FGreen;
-end;
-
-procedure TGColorPicker.SetSelectedColor(c: TColor);
-begin
-  if WebSafe then c := GetWebSafe(c);
-  FChange := false;
-  SetRed(GetRValue(c));
-  SetBlue(GetBValue(c));
-  SetGreen(GetGValue(c));
-  FManual := false;
-  FChange := true;
-  if Assigned(OnChange) then OnChange(Self);
-end;
-
-function TGColorPicker.GetArrowPos: integer;
-begin
-  Result := ArrowPosFromGreen(FGreen);
-end;
-
 procedure TGColorPicker.Execute(tbaAction: integer);
 begin
   case tbaAction of
@@ -204,4 +116,90 @@ begin
   end;
 end;
 
+function TGColorPicker.GetArrowPos: integer;
+begin
+  Result := ArrowPosFromGreen(FGreen);
+end;
+
+function TGColorPicker.GetGradientColor(AValue: Integer): TColor;
+begin
+  Result := RGB(FRed, AValue, FBlue);
+end;
+
+function TGColorPicker.GetSelectedColor: TColor;
+begin
+  if not WebSafe then
+    Result := RGB(FRed, FGreen, FBlue)
+  else
+    Result := GetWebSafe(RGB(FRed, FGreen, FBlue));
+end;
+
+function TGColorPicker.GetSelectedValue: integer;
+begin
+  Result := FGreen;
+end;
+
+function TGColorPicker.GreenFromArrowPos(p: integer): integer;
+var
+  g: integer;
+begin
+  if Layout = lyHorizontal then
+    g := Round(p/((Width - 12)/255))
+  else
+    g := Round(255 - p/((Height - 12)/255));
+  Clamp(g, 0, 255);
+  Result := g;
+end;
+
+procedure TGColorPicker.SetBlue(b: integer);
+begin
+  Clamp(b, 0, 255);
+  if FBlue <> b then
+  begin
+    FBlue := b;
+    FManual := false;
+    CreateGradient;
+    Invalidate;
+    if FChange and Assigned(OnChange) then OnChange(Self);
+  end;
+end;
+
+procedure TGColorPicker.SetGreen(g: integer);
+begin
+  Clamp(g, 0, 255);
+  if FGreen <> g then
+  begin
+    FGreen := g;
+    FArrowPos := ArrowPosFromGreen(g);
+    FManual := false;
+    Invalidate;
+    if FChange and Assigned(OnChange) then OnChange(Self);
+  end;
+end;
+
+procedure TGColorPicker.SetRed(r: integer);
+begin
+  Clamp(r, 0, 255);
+  if FRed <> r then
+  begin
+    FRed := r;
+    FManual := false;
+    CreateGradient;
+    Invalidate;
+    if FChange and Assigned(OnChange) then OnChange(Self);
+  end;
+end;
+
+procedure TGColorPicker.SetSelectedColor(c: TColor);
+begin
+  if WebSafe then c := GetWebSafe(c);
+  FChange := false;
+  SetRed(GetRValue(c));
+  SetBlue(GetBValue(c));
+  SetGreen(GetGValue(c));
+  FManual := false;
+  FChange := true;
+  if Assigned(OnChange) then OnChange(Self);
+end;
+
 end.