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

jvcllaz: Improvements in the JvFullColorCircle and JvFullColor dialogs for Linux.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6882 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-04-28 20:37:08 +00:00
parent c04df98dba
commit 451f4586af
6 changed files with 169 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogMainForm.lfm
View File

@ -1,15 +1,16 @@
object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
Left = 836 Left = 836
Height = 394 Height = 315
Top = 214 Top = 214
Width = 343 Width = 274
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'JvFullColorCircleDlgMainFrm' Caption = 'JvFullColorCircleDlgMainFrm'
ClientHeight = 394 ClientHeight = 315
ClientWidth = 343 ClientWidth = 274
Color = clBtnFace Color = clBtnFace
Font.Color = clWindowText Font.Color = clWindowText
KeyPreview = True KeyPreview = True
OnActivate = FormActivate
OnCreate = FormCreate OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.1.0.0' LCLVersion = '2.1.0.0'
@ -18,12 +19,12 @@ object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
AnchorSideLeft.Side = asrCenter AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = ComboBoxFileName AnchorSideTop.Control = ComboBoxFileName
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 30 Left = 33
Height = 108 Height = 86
Top = 39 Top = 35
Width = 108 Width = 86
BorderSpacing.Left = 8 BorderSpacing.Left = 6
BorderSpacing.Top = 8 BorderSpacing.Top = 6
Style = bsRaised Style = bsRaised
end end
object Image: TImage object Image: TImage
@ -31,24 +32,26 @@ object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
AnchorSideLeft.Side = asrCenter AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = Bevel AnchorSideTop.Control = Bevel
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 34 Left = 36
Height = 100 Height = 80
Top = 43 Top = 38
Width = 100 Width = 80
Center = True Center = True
end end
object LabelImage: TLabel object LabelImage: TLabel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ComboBoxFileName AnchorSideTop.Control = ComboBoxFileName
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 8 Left = 6
Height = 15 Height = 15
Top = 12 Top = 10
Width = 39 Width = 39
BorderSpacing.Left = 8 BorderSpacing.Left = 6
Caption = 'Image :' Caption = 'Image :'
Font.Color = clWindowText
Layout = tlCenter Layout = tlCenter
ParentColor = False ParentColor = False
ParentFont = False
end end
object Memo: TMemo object Memo: TMemo
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
@ -56,20 +59,22 @@ object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Bevel AnchorSideRight.Control = Bevel
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 8 Left = 6
Height = 72 Height = 70
Top = 155 Top = 127
Width = 152 Width = 141
Alignment = taCenter Alignment = taCenter
BorderSpacing.Left = 8 BorderSpacing.Left = 6
BorderSpacing.Top = 8 BorderSpacing.Top = 6
BorderStyle = bsNone BorderStyle = bsNone
Font.Color = clWindowText
Lines.Strings = ( Lines.Strings = (
'Original image' 'Original image'
) )
OnKeyDown = MemoKeyDown OnKeyDown = MemoKeyDown
OnKeyPress = MemoKeyPress OnKeyPress = MemoKeyPress
ParentColor = True ParentColor = True
ParentFont = False
TabOrder = 0 TabOrder = 0
end end
object ComboBoxFileName: TComboBox object ComboBoxFileName: TComboBox
@ -77,17 +82,19 @@ object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 55 Left = 51
Height = 23 Height = 23
Top = 8 Top = 6
Width = 225 Width = 206
BorderSpacing.Left = 8 BorderSpacing.Left = 6
BorderSpacing.Top = 8 BorderSpacing.Top = 6
BorderSpacing.Right = 8 BorderSpacing.Right = 6
DropDownCount = 24 DropDownCount = 24
Font.Color = clWindowText
ItemHeight = 15 ItemHeight = 15
OnClick = ComboBoxFileNameSelect OnClick = ComboBoxFileNameSelect
OnSelect = ComboBoxFileNameSelect OnSelect = ComboBoxFileNameSelect
ParentFont = False
Style = csDropDownList Style = csDropDownList
TabOrder = 1 TabOrder = 1
end end

21
components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogMainForm.pas
View File

@ -46,6 +46,7 @@ type
LabelImage: TLabel; LabelImage: TLabel;
ComboBoxFileName: TComboBox; ComboBoxFileName: TComboBox;
JvFullColorCircleDialog: TJvFullColorCircleDialog; JvFullColorCircleDialog: TJvFullColorCircleDialog;
procedure FormActivate(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure MemoKeyDown(Sender: TObject; var Key: Word; procedure MemoKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState); Shift: TShiftState);
@ -89,12 +90,6 @@ var
procedure TJvFullColorCircleDlgMainFrm.FormCreate(Sender: TObject); procedure TJvFullColorCircleDlgMainFrm.FormCreate(Sender: TObject);
var var
X, Y: Integer;
PitchX, PitchY: Integer;
LImage: TImage;
LMemo: TMemo;
LBevel: TBevel;
Index: Integer;
LSearchRec: TSearchRec; LSearchRec: TSearchRec;
begin begin
ImgDir := IncludeTrailingPathDelimiter(GetCurrentDir) + '../../design/JvCtrls/images/'; ImgDir := IncludeTrailingPathDelimiter(GetCurrentDir) + '../../design/JvCtrls/images/';
@ -103,7 +98,17 @@ begin
ComboBoxFileName.Items.Add(LSearchRec.Name); ComboBoxFileName.Items.Add(LSearchRec.Name);
until FindNext(LSearchRec) <> 0; until FindNext(LSearchRec) <> 0;
FindClose(LSearchRec); FindClose(LSearchRec);
end;
procedure TJvFullColorCircleDlgMainFrm.FormActivate(Sender: TObject);
var
X, Y: Integer;
PitchX, PitchY: Integer;
LImage: TImage;
LMemo: TMemo;
LBevel: TBevel;
Index: Integer;
begin
PitchX := Memo.Width + 32; PitchX := Memo.Width + 32;
PitchY := Memo.Top + Memo.Height - Image.Top + 31; PitchY := Memo.Top + Memo.Height - Image.Top + 31;
Index := 0; Index := 0;
@ -135,7 +140,7 @@ begin
LImage.OnDblClick := @CustomizeDblClick; LImage.OnDblClick := @CustomizeDblClick;
LMemo.OnDblClick := @CustomizeDblClick; LMemo.OnDblClick := @CustomizeDblClick;
ClientWidth := LMemo.Left+LMemo.Width-1+Memo.Left; ClientWidth := LMemo.Left+LMemo.Width-1+Memo.Left;
ClientHeight := LMemo.Top+LMemo.Height-1+Image.Top; ClientHeight := LMemo.Top+LMemo.Height-1+ComboboxFileName.Top;
end; end;
Memos[Index] := LMemo; Memos[Index] := LMemo;
Images[Index] := LImage; Images[Index] := LImage;

123
components/jvcllaz/run/JvMM/jvfullcolorcircleform.lfm
View File

@ -1,13 +1,13 @@
object JvFullColorCircleFrm: TJvFullColorCircleFrm object JvFullColorCircleFrm: TJvFullColorCircleFrm
Left = 274 Left = 274
Height = 573 Height = 574
Top = 219 Top = 219
Width = 997 Width = 1010
AutoSize = True AutoSize = True
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Color circle configurations' Caption = 'Color circle configurations'
ClientHeight = 573 ClientHeight = 574
ClientWidth = 997 ClientWidth = 1010
Color = clBtnFace Color = clBtnFace
Font.Color = clWindowText Font.Color = clWindowText
KeyPreview = True KeyPreview = True
@ -24,7 +24,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 22 Width = 22
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = 'Old:' Caption = 'Old:'
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object LabelNew: TLabel object LabelNew: TLabel
AnchorSideLeft.Control = PanelImageNew AnchorSideLeft.Control = PanelImageNew
@ -34,7 +36,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 58 Top = 58
Width = 27 Width = 27
Caption = 'New:' Caption = 'New:'
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object LabelColorSpace: TLabel object LabelColorSpace: TLabel
AnchorSideLeft.Control = JvColorSpaceCombo AnchorSideLeft.Control = JvColorSpaceCombo
@ -45,7 +49,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 66 Width = 66
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = '&Color Space:' Caption = '&Color Space:'
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object PanelGraphics: TPanel object PanelGraphics: TPanel
AnchorSideLeft.Control = PanelCommonSettings AnchorSideLeft.Control = PanelCommonSettings
@ -58,26 +64,30 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Left = 412 Left = 412
Height = 550 Height = 550
Top = 8 Top = 8
Width = 577 Width = 590
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Right = 8 BorderSpacing.Right = 8
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'PanelGraphics' Caption = 'PanelGraphics'
ClientHeight = 550 ClientHeight = 550
ClientWidth = 577 ClientWidth = 590
Font.Color = clWindowText
ParentFont = False
TabOrder = 5 TabOrder = 5
object LabelAxisSettings: TLabel object LabelAxisSettings: TLabel
AnchorSideLeft.Control = JvColorAxisConfigCombo AnchorSideLeft.Control = JvColorAxisConfigCombo
AnchorSideTop.Control = PanelGraphics AnchorSideTop.Control = PanelGraphics
Left = 201 Left = 208
Height = 15 Height = 15
Top = 10 Top = 10
Width = 69 Width = 69
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = 'A&xis Settings:' Caption = 'A&xis Settings:'
FocusControl = JvColorAxisConfigCombo FocusControl = JvColorAxisConfigCombo
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object JvColorCircle: TJvFullColorCircle object JvColorCircle: TJvFullColorCircle
AnchorSideLeft.Control = Bevel10 AnchorSideLeft.Control = Bevel10
@ -91,7 +101,7 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Left = 100 Left = 100
Height = 480 Height = 480
Top = 60 Top = 60
Width = 459 Width = 472
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Top = 8 BorderSpacing.Top = 8
@ -196,13 +206,15 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
AnchorSideLeft.Side = asrCenter AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = LabelAxisSettings AnchorSideTop.Control = LabelAxisSettings
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 201 Left = 208
Height = 23 Height = 23
Top = 29 Top = 29
Width = 257 Width = 257
Selected = acXYZ Selected = acXYZ
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Font.Color = clWindowText
ItemHeight = 15 ItemHeight = 15
ParentFont = False
TabOrder = 0 TabOrder = 0
OnChange = JvColorAxisConfigComboChange OnChange = JvColorAxisConfigComboChange
end end
@ -232,6 +244,8 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BevelOuter = bvLowered BevelOuter = bvLowered
ClientHeight = 95 ClientHeight = 95
ClientWidth = 380 ClientWidth = 380
Font.Color = clWindowText
ParentFont = False
TabOrder = 2 TabOrder = 2
object LabelComAxis0: TLabel object LabelComAxis0: TLabel
AnchorSideLeft.Control = SpinEditComAxis0 AnchorSideLeft.Control = SpinEditComAxis0
@ -242,7 +256,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 81 Width = 81
BorderSpacing.Top = 14 BorderSpacing.Top = 14
Caption = 'LabelComAxis0' Caption = 'LabelComAxis0'
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object LabelComAxis1: TLabel object LabelComAxis1: TLabel
AnchorSideLeft.Control = SpinEditComAxis1 AnchorSideLeft.Control = SpinEditComAxis1
@ -252,7 +268,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 16 Top = 16
Width = 81 Width = 81
Caption = 'LabelComAxis1' Caption = 'LabelComAxis1'
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object LabelComAxis2: TLabel object LabelComAxis2: TLabel
AnchorSideLeft.Control = SpinEditComAxis2 AnchorSideLeft.Control = SpinEditComAxis2
@ -262,7 +280,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 16 Top = 16
Width = 81 Width = 81
Caption = 'LabelComAxis2' Caption = 'LabelComAxis2'
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object LabelCommon: TLabel object LabelCommon: TLabel
AnchorSideTop.Control = SpinEditComAxis0 AnchorSideTop.Control = SpinEditComAxis0
@ -278,7 +298,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BorderSpacing.Right = 8 BorderSpacing.Right = 8
Caption = 'C&ommon:' Caption = 'C&ommon:'
FocusControl = SpinEditComAxis0 FocusControl = SpinEditComAxis0
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object SpinEditComAxis0: TSpinEdit object SpinEditComAxis0: TSpinEdit
Tag = 48 Tag = 48
@ -292,7 +314,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 57 Width = 57
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Enabled = False Enabled = False
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 0 TabOrder = 0
end end
object SpinEditComAxis1: TSpinEdit object SpinEditComAxis1: TSpinEdit
@ -306,7 +330,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 35 Top = 35
Width = 57 Width = 57
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 1 TabOrder = 1
end end
object SpinEditComAxis2: TSpinEdit object SpinEditComAxis2: TSpinEdit
@ -320,7 +346,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 35 Top = 35
Width = 57 Width = 57
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 2 TabOrder = 2
end end
object CheckBoxCom0: TCheckBox object CheckBoxCom0: TCheckBox
@ -334,7 +362,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 104 Width = 104
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'CheckBoxCom0' Caption = 'CheckBoxCom0'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 3 TabOrder = 3
end end
object CheckBoxCom1: TCheckBox object CheckBoxCom1: TCheckBox
@ -346,7 +376,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 62 Top = 62
Width = 104 Width = 104
Caption = 'CheckBoxCom1' Caption = 'CheckBoxCom1'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 4 TabOrder = 4
end end
object CheckBoxCom2: TCheckBox object CheckBoxCom2: TCheckBox
@ -358,7 +390,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 62 Top = 62
Width = 104 Width = 104
Caption = 'CheckBoxCom2' Caption = 'CheckBoxCom2'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 5 TabOrder = 5
end end
object Bevel2: TBevel object Bevel2: TBevel
@ -424,6 +458,8 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BevelOuter = bvLowered BevelOuter = bvLowered
ClientHeight = 203 ClientHeight = 203
ClientWidth = 380 ClientWidth = 380
Font.Color = clWindowText
ParentFont = False
TabOrder = 4 TabOrder = 4
object LabelAxis0: TLabel object LabelAxis0: TLabel
AnchorSideLeft.Control = SpinEditRedAxis0 AnchorSideLeft.Control = SpinEditRedAxis0
@ -434,7 +470,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 55 Width = 55
BorderSpacing.Top = 14 BorderSpacing.Top = 14
Caption = 'LabelAxis0' Caption = 'LabelAxis0'
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object LabelAxis1: TLabel object LabelAxis1: TLabel
AnchorSideLeft.Control = SpinEditRedAxis1 AnchorSideLeft.Control = SpinEditRedAxis1
@ -444,7 +482,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 16 Top = 16
Width = 55 Width = 55
Caption = 'LabelAxis1' Caption = 'LabelAxis1'
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object LabelAxis2: TLabel object LabelAxis2: TLabel
AnchorSideLeft.Control = SpinEditRedAxis2 AnchorSideLeft.Control = SpinEditRedAxis2
@ -454,7 +494,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 16 Top = 16
Width = 55 Width = 55
Caption = 'LabelAxis2' Caption = 'LabelAxis2'
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object LabelRed: TLabel object LabelRed: TLabel
AnchorSideTop.Control = SpinEditRedAxis0 AnchorSideTop.Control = SpinEditRedAxis0
@ -469,8 +511,10 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BorderSpacing.Right = 8 BorderSpacing.Right = 8
Caption = '&Red:' Caption = '&Red:'
FocusControl = SpinEditRedAxis0 FocusControl = SpinEditRedAxis0
Font.Color = clWindowText
ParentBidiMode = False ParentBidiMode = False
ParentColor = False ParentColor = False
ParentFont = False
end end
object LabelGreen: TLabel object LabelGreen: TLabel
AnchorSideTop.Control = SpinEditGreenAxis0 AnchorSideTop.Control = SpinEditGreenAxis0
@ -485,7 +529,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BorderSpacing.Right = 8 BorderSpacing.Right = 8
Caption = '&Green:' Caption = '&Green:'
FocusControl = SpinEditGreenAxis0 FocusControl = SpinEditGreenAxis0
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object LabelBlue: TLabel object LabelBlue: TLabel
AnchorSideTop.Control = SpinEditBlueAxis0 AnchorSideTop.Control = SpinEditBlueAxis0
@ -500,7 +546,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BorderSpacing.Right = 8 BorderSpacing.Right = 8
Caption = '&Blue:' Caption = '&Blue:'
FocusControl = SpinEditBlueAxis0 FocusControl = SpinEditBlueAxis0
Font.Color = clWindowText
ParentColor = False ParentColor = False
ParentFont = False
end end
object SpinEditRedAxis0: TSpinEdit object SpinEditRedAxis0: TSpinEdit
AnchorSideLeft.Control = Bevel6 AnchorSideLeft.Control = Bevel6
@ -512,7 +560,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 35 Top = 35
Width = 57 Width = 57
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 0 TabOrder = 0
end end
object SpinEditGreenAxis0: TSpinEdit object SpinEditGreenAxis0: TSpinEdit
@ -526,7 +576,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 89 Top = 89
Width = 57 Width = 57
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 6 TabOrder = 6
end end
object SpinEditBlueAxis0: TSpinEdit object SpinEditBlueAxis0: TSpinEdit
@ -540,7 +592,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 143 Top = 143
Width = 57 Width = 57
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 12 TabOrder = 12
end end
object SpinEditRedAxis1: TSpinEdit object SpinEditRedAxis1: TSpinEdit
@ -554,7 +608,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 35 Top = 35
Width = 57 Width = 57
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 1 TabOrder = 1
end end
object SpinEditRedAxis2: TSpinEdit object SpinEditRedAxis2: TSpinEdit
@ -568,7 +624,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 35 Top = 35
Width = 57 Width = 57
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 2 TabOrder = 2
end end
object SpinEditGreenAxis1: TSpinEdit object SpinEditGreenAxis1: TSpinEdit
@ -582,7 +640,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 89 Top = 89
Width = 57 Width = 57
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 7 TabOrder = 7
end end
object SpinEditGreenAxis2: TSpinEdit object SpinEditGreenAxis2: TSpinEdit
@ -596,7 +656,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 89 Top = 89
Width = 57 Width = 57
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 8 TabOrder = 8
end end
object SpinEditBlueAxis1: TSpinEdit object SpinEditBlueAxis1: TSpinEdit
@ -610,7 +672,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 143 Top = 143
Width = 57 Width = 57
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 13 TabOrder = 13
end end
object SpinEditBlueAxis2: TSpinEdit object SpinEditBlueAxis2: TSpinEdit
@ -624,7 +688,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Top = 143 Top = 143
Width = 57 Width = 57
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Font.Color = clWindowText
OnChange = SpinEditSettingsValueChange OnChange = SpinEditSettingsValueChange
ParentFont = False
TabOrder = 14 TabOrder = 14
end end
object CheckBoxRed0: TCheckBox object CheckBoxRed0: TCheckBox
@ -637,7 +703,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 98 Width = 98
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'CheckBoxRed0' Caption = 'CheckBoxRed0'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 3 TabOrder = 3
end end
object CheckBoxRed1: TCheckBox object CheckBoxRed1: TCheckBox
@ -651,7 +719,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 98 Width = 98
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'CheckBoxRed1' Caption = 'CheckBoxRed1'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 4 TabOrder = 4
end end
object CheckBoxRed2: TCheckBox object CheckBoxRed2: TCheckBox
@ -665,7 +735,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 98 Width = 98
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'CheckBoxRed2' Caption = 'CheckBoxRed2'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 5 TabOrder = 5
end end
object CheckBoxGreen0: TCheckBox object CheckBoxGreen0: TCheckBox
@ -679,7 +751,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 109 Width = 109
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'CheckBoxGreen0' Caption = 'CheckBoxGreen0'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 9 TabOrder = 9
end end
object CheckBoxGreen1: TCheckBox object CheckBoxGreen1: TCheckBox
@ -693,7 +767,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 109 Width = 109
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'CheckBoxGreen1' Caption = 'CheckBoxGreen1'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 10 TabOrder = 10
end end
object CheckBoxGreen2: TCheckBox object CheckBoxGreen2: TCheckBox
@ -707,7 +783,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 109 Width = 109
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'CheckBoxGreen2' Caption = 'CheckBoxGreen2'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 11 TabOrder = 11
end end
object CheckBoxBlue0: TCheckBox object CheckBoxBlue0: TCheckBox
@ -721,7 +799,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 101 Width = 101
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'CheckBoxBlue0' Caption = 'CheckBoxBlue0'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 15 TabOrder = 15
end end
object CheckBoxBlue1: TCheckBox object CheckBoxBlue1: TCheckBox
@ -735,7 +815,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 101 Width = 101
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'CheckBoxBlue1' Caption = 'CheckBoxBlue1'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 16 TabOrder = 16
end end
object CheckBoxBlue2: TCheckBox object CheckBoxBlue2: TCheckBox
@ -749,7 +831,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 101 Width = 101
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'CheckBoxBlue2' Caption = 'CheckBoxBlue2'
Font.Color = clWindowText
OnClick = CheckBoxSettingsClick OnClick = CheckBoxSettingsClick
ParentFont = False
TabOrder = 17 TabOrder = 17
end end
object Bevel6: TBevel object Bevel6: TBevel
@ -815,7 +899,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = 'Co&mmon Settings:' Caption = 'Co&mmon Settings:'
Font.Color = clWindowText
OnClick = RadioButtonAxisClick OnClick = RadioButtonAxisClick
ParentFont = False
TabOrder = 1 TabOrder = 1
end end
object RadioButtonAxisSettings: TRadioButton object RadioButtonAxisSettings: TRadioButton
@ -829,7 +915,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = '&Axis Settings:' Caption = '&Axis Settings:'
Font.Color = clWindowText
OnClick = RadioButtonAxisClick OnClick = RadioButtonAxisClick
ParentFont = False
TabOrder = 3 TabOrder = 3
end end
object ButtonGraphics: TButton object ButtonGraphics: TButton
@ -847,7 +935,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BorderSpacing.Top = 1 BorderSpacing.Top = 1
Caption = 'ButtonGraphics' Caption = 'ButtonGraphics'
Constraints.MinWidth = 75 Constraints.MinWidth = 75
Font.Color = clWindowText
OnClick = ButtonGraphicsClick OnClick = ButtonGraphicsClick
ParentFont = False
TabOrder = 9 TabOrder = 9
end end
object ButtonCancel: TButton object ButtonCancel: TButton
@ -864,7 +954,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Cancel = True Cancel = True
Caption = 'Ca&ncel' Caption = 'Ca&ncel'
Constraints.MinWidth = 75 Constraints.MinWidth = 75
Font.Color = clWindowText
ModalResult = 2 ModalResult = 2
ParentFont = False
TabOrder = 7 TabOrder = 7
end end
object ButtonOK: TButton object ButtonOK: TButton
@ -881,7 +973,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Caption = '&OK' Caption = '&OK'
Constraints.MinWidth = 75 Constraints.MinWidth = 75
Default = True Default = True
Font.Color = clWindowText
ModalResult = 1 ModalResult = 1
ParentFont = False
TabOrder = 6 TabOrder = 6
end end
object ButtonApply: TButton object ButtonApply: TButton
@ -891,11 +985,14 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Left = 182 Left = 182
Height = 25 Height = 25
Top = 534 Top = 534
Width = 75 Width = 57
AutoSize = True
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Top = 1 BorderSpacing.Top = 1
Caption = '&Apply' Caption = '&Apply'
Font.Color = clWindowText
OnClick = ButtonApplyClick OnClick = ButtonApplyClick
ParentFont = False
TabOrder = 8 TabOrder = 8
end end
object JvColorSpaceCombo: TJvFullColorSpaceCombo object JvColorSpaceCombo: TJvFullColorSpaceCombo
@ -909,7 +1006,9 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
Width = 206 Width = 206
AllowVariable = False AllowVariable = False
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Font.Color = clWindowText
ItemHeight = 15 ItemHeight = 15
ParentFont = False
TabOrder = 0 TabOrder = 0
OnChange = JvColorSpaceComboChange OnChange = JvColorSpaceComboChange
end end
@ -935,6 +1034,8 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BevelOuter = bvLowered BevelOuter = bvLowered
ClientHeight = 118 ClientHeight = 118
ClientWidth = 124 ClientWidth = 124
Font.Color = clWindowText
ParentFont = False
TabOrder = 10 TabOrder = 10
object ImageOld: TImage object ImageOld: TImage
Left = 3 Left = 3
@ -959,6 +1060,8 @@ object JvFullColorCircleFrm: TJvFullColorCircleFrm
BevelOuter = bvLowered BevelOuter = bvLowered
ClientHeight = 118 ClientHeight = 118
ClientWidth = 124 ClientWidth = 124
Font.Color = clWindowText
ParentFont = False
TabOrder = 11 TabOrder = 11
object ImageNew: TImage object ImageNew: TImage
Left = 3 Left = 3

2
components/jvcllaz/run/JvMM/jvfullcolorcircleform.pas
View File

@ -714,7 +714,7 @@ begin
w := 0; w := 0;
for i := 0 to JvColorSpaceCombo.Items.Count-1 do for i := 0 to JvColorSpaceCombo.Items.Count-1 do
w := Max(w, JvColorSpaceCombo.Canvas.TextWidth(JvColorSpaceCombo.Items[i])); w := Max(w, JvColorSpaceCombo.Canvas.TextWidth(JvColorSpaceCombo.Items[i]));
JvColorSpaceCombo.Width := w + 24; JvColorSpaceCombo.Width := w + 32;
Bevel1.Shape := bsSpacer; Bevel1.Shape := bsSpacer;
Bevel10.Shape := bsSpacer; Bevel10.Shape := bsSpacer;

3
components/jvcllaz/run/JvMM/jvfullcolorform.pas
View File

@ -162,7 +162,8 @@ begin
w := 0; w := 0;
for i := 0 to JvColorAxisConfigCombo.Items.Count-1 do for i := 0 to JvColorAxisConfigCombo.Items.Count-1 do
w := Max(w, JvColorAxisConfigCombo.Canvas.TextWidth(JvColorAxisConfigCombo.Items[i])); w := Max(w, JvColorAxisConfigCombo.Canvas.TextWidth(JvColorAxisConfigCombo.Items[i]));
JvColorAxisConfigCombo.Constraints.MinWidth := w + 40;; JvColorAxisConfigCombo.Constraints.MinWidth := w + 40;
JvColorPanel.Constraints.MinWidth := JvColorPanel.Height;
AutoSize := true; AutoSize := true;
end; end;

5
components/jvcllaz/run/JvMM/jvfullcolorrotate.pas
View File

@ -273,7 +273,10 @@ begin
if ColorFusion[axIndex2] < 0 then if ColorFusion[axIndex2] < 0 then
ColorFusion[axIndex2] := 0; ColorFusion[axIndex2] := 0;
DestLine^ := // Bitmap Color Format is (MSB)0RGB(LSB) DestLine^ := // Bitmap Color Format is (MSB)0RGB(LSB)
(ColorFusion[axIndex0] shl 16) or (ColorFusion[axIndex1] shl 8) or (ColorFusion[axIndex2]); // or $FF000000; (ColorFusion[axIndex0] shl 16) or
(ColorFusion[axIndex1] shl 8) or
(ColorFusion[axIndex2]) or
$FF000000; // otherwise the bitmap would be fully transparent
Inc(SourceLine); Inc(SourceLine);
Inc(DestLine); Inc(DestLine);
end; end;