Changeset 522 for GraphicTest/Packages/Graphics32/GR32_Dsgn_Color.pas

Timestamp:

Apr 17, 2019, 10:42:18 AM (5 years ago)

Author:

chronos

Message:

• Modified: Updated Graphics32 library.

Location:

GraphicTest/Packages/Graphics32

Files:

• . (modified) (1 prop)
• GR32_Dsgn_Color.pas (modified) (7 diffs)

GraphicTest/Packages/Graphics32/GR32_Dsgn_Color.pas

@@ -47 +47 @@
   Consts,
   DesignIntf, DesignEditors, VCLEditors,
-  Windows, Registry, Graphics, Dialogs, Forms,
+  Windows, Registry, Graphics, Dialogs, Forms, Controls,
 {$ENDIF}
   GR32, GR32_Image;
@@ -70 +70 @@
     procedure RemoveColor(const AName: string);
   end;
+
+{$IFDEF COMPILER2010_UP}
+  TColor32Dialog = class(TCommonDialog)
+  private
+    FColor: TColor32;
+    FCustomColors: TStrings;
+    procedure SetCustomColors(Value: TStrings);
+  public
+    function Execute(ParentWnd: HWND): Boolean; override;
+  published
+    property Color: TColor32 read FColor write FColor default clBlack32;
+    property CustomColors: TStrings read FCustomColors write SetCustomColors;
+    property Ctl3D default True;
+  end;
+{$ENDIF}
 
   { TColor32Property }
@@ -106 +121 @@
 
 implementation
+
+{$IFDEF COMPILER2010_UP}
+uses
+  GR32_Dsgn_ColorPicker;
+{$ENDIF}
 
 { TColorManager }
@@ -387 +407 @@
 
 
+{ TColor32Dialog }
+
+{$IFDEF COMPILER2010_UP}
+procedure TColor32Dialog.SetCustomColors(Value: TStrings);
+begin
+  FCustomColors.Assign(Value);
+end;
+
+function TColor32Dialog.Execute(ParentWnd: HWND): Boolean;
+var
+  ColorPicker: TFormColorPicker;
+begin
+  ColorPicker := TFormColorPicker.Create(nil);
+  try
+    ColorPicker.Color := FColor;
+    Result := ColorPicker.ShowModal = mrOK;
+    if Result then
+      FColor := ColorPicker.Color;
+  finally
+    ColorPicker.Free;
+  end;
+end;
+{$ENDIF}
+
+
 { TColor32Property }
 
@@ -392 +437 @@
 procedure TColor32Property.Edit;
 var
+{$IFDEF COMPILER2010_UP}
+  ColorDialog: TColor32Dialog;
+{$ELSE}
   ColorDialog: TColorDialog;
+{$ENDIF}
   IniFile: TRegIniFile;
 
@@ -427 +476 @@
 begin
   IniFile := nil;
+{$IFDEF COMPILER2010_UP}
+  ColorDialog := TColor32Dialog.Create(Application);
+{$ELSE}
   ColorDialog := TColorDialog.Create(Application);
+{$ENDIF}
   try
     GetCustomColors;
-    ColorDialog.Color := WinColor(GetOrdValue);
+    ColorDialog.Color := GetOrdValue;
     ColorDialog.HelpContext := 25010;
+{$IFNDEF COMPILER2010_UP}
     ColorDialog.Options := [cdShowHelp];
+{$ENDIF}
     if ColorDialog.Execute then
-      SetOrdValue(Cardinal(Color32(ColorDialog.Color)));
+      SetOrdValue(Cardinal(ColorDialog.Color));
     SaveCustomColors;
   finally
@@ -446 +501 @@
 begin
   Result := [paMultiSelect, {$IFDEF EXT_PROP_EDIT}paDialog,{$ENDIF} paValueList,
-  paRevertable];
+    paRevertable];
 end;