mbColorLib: Fix mouse color tracking of CIEL/A/B pickers in Linux.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5554 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-12-21 18:50:20 +00:00
parent b582b0b78e
commit 77f9d53a72
6 changed files with 91 additions and 114 deletions

View File

@@ -43,9 +43,9 @@ object Form1: TForm1
Height = 384
Top = 6
Width = 403
ActivePage = TabSheet9
ActivePage = TabSheet7
Anchors = [akTop, akLeft, akRight, akBottom]
TabIndex = 9
TabIndex = 7
TabOrder = 0
OnChange = PageControl1Change
OnMouseMove = PageControl1MouseMove
@@ -721,8 +721,8 @@ object Form1: TForm1
TabOrder = 2
Hue = 0
Saturation = 0
Luminance = 73
SelectedColor = 4802889
Luminance = 65
SelectedColor = 4276545
end
object VColorPicker1: TVColorPicker
Left = 34
@@ -1038,7 +1038,6 @@ object Form1: TForm1
Width = 100
HintFormat = 'G: %g B: %b'#13'Hex: #%hex'
TabOrder = 0
OnChange = RAxisColorPicker1Change
end
object GAxisColorPicker1: TGAxisColorPicker
Left = 130
@@ -1048,7 +1047,6 @@ object Form1: TForm1
HintFormat = 'R: %r B: %b'#13'Hex: #%hex'
TabOrder = 1
MarkerStyle = msCross
OnChange = GAxisColorPicker1Change
end
object BAxisColorPicker1: TBAxisColorPicker
Left = 250
@@ -1058,7 +1056,6 @@ object Form1: TForm1
HintFormat = 'R: %r G: %g'#13'Hex: #%hex'
TabOrder = 2
MarkerStyle = msCrossCirc
OnChange = BAxisColorPicker1Change
end
object CIELColorPicker1: TCIELColorPicker
Left = 10
@@ -1071,7 +1068,6 @@ object Form1: TForm1
AValue = -47
BValue = -32
LValue = 88
OnChange = CIELColorPicker1Change
end
object CIEAColorPicker1: TCIEAColorPicker
Left = 130
@@ -1085,7 +1081,6 @@ object Form1: TForm1
AValue = 96
BValue = -78
MarkerStyle = msSquare
OnChange = CIEAColorPicker1Change
end
object CIEBColorPicker1: TCIEBColorPicker
Left = 250
@@ -1098,7 +1093,6 @@ object Form1: TForm1
AValue = -88
BValue = 74
LValue = 88
OnChange = CIEBColorPicker1Change
end
object Label10: TLabel
Left = 130
@@ -1148,42 +1142,6 @@ object Form1: TForm1
Caption = 'CIEBColorPicker'
ParentColor = False
end
object RAxisIndicator: TShape
Left = 88
Height = 21
Top = 132
Width = 22
end
object GAxisIndicator: TShape
Left = 208
Height = 21
Top = 132
Width = 22
end
object BAxisIndicator: TShape
Left = 328
Height = 21
Top = 132
Width = 22
end
object CIEBIndicator: TShape
Left = 328
Height = 21
Top = 296
Width = 22
end
object CIEAIndicator: TShape
Left = 208
Height = 21
Top = 296
Width = 22
end
object CIELIndicator: TShape
Left = 88
Height = 21
Top = 296
Width = 22
end
end
end
object sc: TmbColorPreview

View File

@@ -20,10 +20,8 @@ type
{ TForm1 }
TForm1 = class(TForm)
CIEBIndicator: TShape;
CbShowHints: TCheckBox;
CbEnabled: TCheckBox;
CIEAIndicator: TShape;
Label10: TLabel;
Label11: TLabel;
Label12: TLabel;
@@ -31,10 +29,6 @@ type
Label14: TLabel;
Label15: TLabel;
PageControl1: TPageControl;
RAxisIndicator: TShape;
GAxisIndicator: TShape;
BAxisIndicator: TShape;
CIELIndicator: TShape;
TabSheet1: TTabSheet;
TabSheet2: TTabSheet;
TabSheet3: TTabSheet;
@@ -111,19 +105,13 @@ type
Memo1: TMemo;
Label9: TLabel;
CbSwatchStyle: TCheckBox;
procedure BAxisColorPicker1Change(Sender: TObject);
procedure CbEnabledChange(Sender: TObject);
procedure CbShowHintsChange(Sender: TObject);
procedure CIEAColorPicker1Change(Sender: TObject);
procedure CIEBColorPicker1Change(Sender: TObject);
procedure CIELColorPicker1Change(Sender: TObject);
procedure GAxisColorPicker1Change(Sender: TObject);
procedure HColorPicker1GetHintStr(Sender: TObject; X, Y: Integer;
var AText: String);
procedure PageControl1Change(Sender: TObject);
procedure PageControl1MouseMove(Sender: TObject; Shift: TShiftState;
X, Y: Integer);
procedure RAxisColorPicker1Change(Sender: TObject);
procedure tb1Change(Sender: TObject);
procedure tb2Change(Sender: TObject);
procedure HSLColorPicker1Change(Sender: TObject);
@@ -220,11 +208,6 @@ begin
uc.color := hexacolorpicker1.ColorUnderCursor;
end;
procedure TForm1.BAxisColorPicker1Change(Sender: TObject);
begin
BAxisIndicator.Brush.Color := BAxisColorPicker1.SelectedColor;
end;
procedure TForm1.Button1Click(Sender: TObject);
begin
mbColorPalette1.GeneratePalette(clblue);
@@ -298,11 +281,6 @@ begin
uc.color := HSLColorpicker1.ColorUnderCursor;
end;
procedure TForm1.RAxisColorPicker1Change(Sender: TObject);
begin
RAxisIndicator.Brush.Color := RAxisColorPicker1.SelectedColor;
end;
procedure TForm1.OfficeColorDialogButtonClick(Sender: TObject);
begin
if mbOfficeColorDialog1.Execute then
@@ -363,11 +341,6 @@ begin
end;
end;
procedure TForm1.GAxisColorPicker1Change(Sender: TObject);
begin
GAxisIndicator.Brush.Color := GAxisColorPicker1.SelectedColor;
end;
procedure TForm1.HColorPicker1GetHintStr(Sender: TObject; X, Y: Integer;
var AText: String);
begin
@@ -389,21 +362,6 @@ begin
hexacolorpicker1.NewArrowStyle := checkbox2.checked;
end;
procedure TForm1.CIEAColorPicker1Change(Sender: TObject);
begin
CIEAIndicator.Brush.Color := CIEAColorPicker1.SelectedColor;
end;
procedure TForm1.CIEBColorPicker1Change(Sender: TObject);
begin
CIEBIndicator.Brush.Color := CIEBColorPicker1.SelectedColor;
end;
procedure TForm1.CIELColorPicker1Change(Sender: TObject);
begin
CIELIndicator.Brush.Color := CIELColorPicker1.SelectedColor;
end;
procedure TForm1.Button4Click(Sender: TObject);
begin
if opendialog1.Execute then