diff --git a/components/mbColorLib/examples/fulldemo/main.lfm b/components/mbColorLib/examples/fulldemo/main.lfm index 9d8b5f01c..30f87aaf2 100644 --- a/components/mbColorLib/examples/fulldemo/main.lfm +++ b/components/mbColorLib/examples/fulldemo/main.lfm @@ -42,22 +42,22 @@ object Form1: TForm1 Height = 384 Top = 6 Width = 403 - ActivePage = TabSheet10 + ActivePage = TabSheet5 Anchors = [akTop, akLeft, akRight, akBottom] - TabIndex = 10 + TabIndex = 4 TabOrder = 0 OnChange = PageControl1Change OnMouseMove = PageControl1MouseMove object TabSheet1: TTabSheet Caption = 'HSLColorPicker' - ClientHeight = 303 - ClientWidth = 391 + ClientHeight = 356 + ClientWidth = 395 object HSLColorPicker1: THSLColorPicker Left = 8 - Height = 287 + Height = 340 Top = 8 - Width = 377 - SelectedColor = 685062 + Width = 381 + SelectedColor = 273922 HSPickerHintFormat = 'H: %h S: %s'#13'Hex: %hex' LPickerHintFormat = 'Luminance: %l' Anchors = [akTop, akLeft, akRight, akBottom] @@ -218,7 +218,7 @@ object Form1: TForm1 TabOrder = 3 object mbColorPalette1: TmbColorPalette Left = 0 - Height = 271 + Height = 234 Top = 0 Width = 378 Anchors = [akTop, akLeft, akRight, akBottom] diff --git a/components/mbColorLib/examples/fulldemo/main.pas b/components/mbColorLib/examples/fulldemo/main.pas index 23caa5ca1..2cbab1eb5 100644 --- a/components/mbColorLib/examples/fulldemo/main.pas +++ b/components/mbColorLib/examples/fulldemo/main.pas @@ -417,7 +417,10 @@ begin else if PageControl1.ActivePage = Tabsheet4 then HSLRingPicker1.Enabled := CbEnabled.Checked 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 SLHColorPicker1.Enabled := CbEnabled.Checked else if PageControl1.ActivePage = Tabsheet11 then diff --git a/components/mbColorLib/mbColorPickerControl.pas b/components/mbColorLib/mbColorPickerControl.pas index 9d9a98cb7..3347848a9 100644 --- a/components/mbColorLib/mbColorPickerControl.pas +++ b/components/mbColorLib/mbColorPickerControl.pas @@ -250,10 +250,10 @@ end; procedure TmbCustomPicker.InternalDrawMarker(X, Y: Integer; C: TColor); begin case MarkerStyle of - msCircle: DrawSelCirc(x, y, Canvas); - msSquare: DrawSelSquare(x, y, Canvas); - msCross: DrawSelCross(x, y, Canvas, c); - msCrossCirc: DrawSelCrossCirc(x, y, Canvas, c); + msCircle : DrawSelCirc(x, y, Canvas); + msSquare : DrawSelSquare(x, y, Canvas); + msCross : DrawSelCross(x, y, Canvas, c); + msCrossCirc : DrawSelCrossCirc(x, y, Canvas, c); end; end; (* @@ -317,8 +317,8 @@ end; procedure TmbCustomPicker.WebSafeChanged; begin - CreateGradient; - Invalidate; + CreateGradient; + Invalidate; end; end.