pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

mbColorLib: one test forgotten in prev commit...

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5518 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-12-16 15:04:18 +00:00
parent 0563e04bea
commit f2809fba90
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/mbColorLib/examples/fulldemo/main.lfm
View File

@ -42,22 +42,22 @@ object Form1: TForm1
Height = 384 Height = 384
Top = 6 Top = 6
Width = 403 Width = 403
ActivePage = TabSheet10 ActivePage = TabSheet5
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
TabIndex = 10 TabIndex = 4
TabOrder = 0 TabOrder = 0
OnChange = PageControl1Change OnChange = PageControl1Change
OnMouseMove = PageControl1MouseMove OnMouseMove = PageControl1MouseMove
object TabSheet1: TTabSheet object TabSheet1: TTabSheet
Caption = 'HSLColorPicker' Caption = 'HSLColorPicker'
ClientHeight = 303 ClientHeight = 356
ClientWidth = 391 ClientWidth = 395
object HSLColorPicker1: THSLColorPicker object HSLColorPicker1: THSLColorPicker
Left = 8 Left = 8
Height = 287 Height = 340
Top = 8 Top = 8
Width = 377 Width = 381
SelectedColor = 685062 SelectedColor = 273922
HSPickerHintFormat = 'H: %h S: %s'#13'Hex: %hex' HSPickerHintFormat = 'H: %h S: %s'#13'Hex: %hex'
LPickerHintFormat = 'Luminance: %l' LPickerHintFormat = 'Luminance: %l'
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
@ -218,7 +218,7 @@ object Form1: TForm1
TabOrder = 3 TabOrder = 3
object mbColorPalette1: TmbColorPalette object mbColorPalette1: TmbColorPalette
Left = 0 Left = 0
Height = 271 Height = 234
Top = 0 Top = 0
Width = 378 Width = 378
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]

5
components/mbColorLib/examples/fulldemo/main.pas
View File

@ -417,7 +417,10 @@ begin
else if PageControl1.ActivePage = Tabsheet4 then else if PageControl1.ActivePage = Tabsheet4 then
HSLRingPicker1.Enabled := CbEnabled.Checked HSLRingPicker1.Enabled := CbEnabled.Checked
else if PageControl1.ActivePage = Tabsheet5 then else if PageControl1.ActivePage = Tabsheet5 then
HSVColorPicker1.Enabled := CbEnabled.Checked begin
HSVColorPicker1.Enabled := CbEnabled.Checked;
VColorPicker1.Enabled := CbEnabled.Checked;
end
else if PageControl1.ActivePage = Tabsheet6 then else if PageControl1.ActivePage = Tabsheet6 then
SLHColorPicker1.Enabled := CbEnabled.Checked SLHColorPicker1.Enabled := CbEnabled.Checked
else if PageControl1.ActivePage = Tabsheet11 then else if PageControl1.ActivePage = Tabsheet11 then

12
components/mbColorLib/mbColorPickerControl.pas
View File

@ -250,10 +250,10 @@ end;
procedure TmbCustomPicker.InternalDrawMarker(X, Y: Integer; C: TColor); procedure TmbCustomPicker.InternalDrawMarker(X, Y: Integer; C: TColor);
begin begin
case MarkerStyle of case MarkerStyle of
msCircle: DrawSelCirc(x, y, Canvas); msCircle : DrawSelCirc(x, y, Canvas);
msSquare: DrawSelSquare(x, y, Canvas); msSquare : DrawSelSquare(x, y, Canvas);
msCross: DrawSelCross(x, y, Canvas, c); msCross : DrawSelCross(x, y, Canvas, c);
msCrossCirc: DrawSelCrossCirc(x, y, Canvas, c); msCrossCirc : DrawSelCrossCirc(x, y, Canvas, c);
end; end;
end; end;
(* (*
@ -317,8 +317,8 @@ end;
procedure TmbCustomPicker.WebSafeChanged; procedure TmbCustomPicker.WebSafeChanged;
begin begin
CreateGradient; CreateGradient;
Invalidate; Invalidate;
end; end;
end. end.