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

mbColorLib: Remove hardcoded font from OfficeMoreColorsDialog. Fix TabOrder in OfficeMoreColorsDialogs.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5531 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-12-16 22:18:09 +00:00
parent 6254bb9039
commit c6f55f0fd1
2 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
components/mbColorLib/OfficeMoreColorsDialog.lfm
View File

@ -11,28 +11,34 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
Constraints.MinHeight = 310 Constraints.MinHeight = 310
Constraints.MinWidth = 340 Constraints.MinWidth = 340
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11
Font.Name = 'MS Shell Dlg 2'
OnCreate = FormCreate OnCreate = FormCreate
OnKeyDown = FormKeyDown OnKeyDown = FormKeyDown
OnResize = FormResize OnResize = FormResize
Position = poMainFormCenter Position = poMainFormCenter
LCLVersion = '1.7' LCLVersion = '1.7'
object Label4: TLabel object Label4: TLabel
Left = 276 AnchorSideLeft.Control = NewSwatch
Height = 13 AnchorSideLeft.Side = asrCenter
Top = 72 AnchorSideBottom.Control = NewSwatch
Width = 21 Left = 278
Anchors = [akTop, akRight] Height = 15
Top = 77
Width = 24
Anchors = [akLeft, akBottom]
BorderSpacing.Bottom = 4
Caption = 'New' Caption = 'New'
ParentColor = False ParentColor = False
end end
object Label5: TLabel object Label5: TLabel
Left = 268 AnchorSideLeft.Control = OldSwatch
Height = 13 AnchorSideLeft.Side = asrCenter
Top = 160 AnchorSideTop.Control = OldSwatch
Width = 37 AnchorSideTop.Side = asrBottom
Anchors = [akTop, akRight] Left = 270
Height = 15
Top = 163
Width = 40
BorderSpacing.Top = 4
Caption = 'Current' Caption = 'Current'
ParentColor = False ParentColor = False
end end
@ -41,9 +47,9 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
Height = 290 Height = 290
Top = 6 Top = 6
Width = 239 Width = 239
ActivePage = Custom ActivePage = Standard
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
TabIndex = 1 TabIndex = 0
TabOrder = 0 TabOrder = 0
OnChange = PagesChange OnChange = PagesChange
object Standard: TTabSheet object Standard: TTabSheet
@ -52,9 +58,9 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
ClientWidth = 231 ClientWidth = 231
object Label2: TLabel object Label2: TLabel
Left = 6 Left = 6
Height = 13 Height = 15
Top = 7 Top = 7
Width = 34 Width = 37
Caption = '&Colors:' Caption = '&Colors:'
FocusControl = Hexa FocusControl = Hexa
ParentColor = False ParentColor = False
@ -80,18 +86,18 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
ImageIndex = 1 ImageIndex = 1
object Label1: TLabel object Label1: TLabel
Left = 6 Left = 6
Height = 13 Height = 15
Top = 7 Top = 7
Width = 34 Width = 37
Caption = '&Colors:' Caption = '&Colors:'
FocusControl = HSL FocusControl = HSL
ParentColor = False ParentColor = False
end end
object Label3: TLabel object Label3: TLabel
Left = 6 Left = 6
Height = 13 Height = 15
Top = 160 Top = 158
Width = 32 Width = 35
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Caption = '&Picker:' Caption = '&Picker:'
FocusControl = cbColorDisplay FocusControl = cbColorDisplay
@ -99,8 +105,8 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
end end
object LRed: TLabel object LRed: TLabel
Left = 6 Left = 6
Height = 13 Height = 15
Top = 186 Top = 184
Width = 23 Width = 23
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Caption = '&Red:' Caption = '&Red:'
@ -108,18 +114,18 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
end end
object LGreen: TLabel object LGreen: TLabel
Left = 6 Left = 6
Height = 13 Height = 15
Top = 212 Top = 210
Width = 33 Width = 34
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Caption = '&Green:' Caption = '&Green:'
ParentColor = False ParentColor = False
end end
object LBlue: TLabel object LBlue: TLabel
Left = 6 Left = 6
Height = 13 Height = 15
Top = 238 Top = 236
Width = 24 Width = 26
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Caption = '&Blue:' Caption = '&Blue:'
ParentColor = False ParentColor = False
@ -130,7 +136,7 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
Top = 156 Top = 156
Width = 147 Width = 147
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
ItemHeight = 13 ItemHeight = 15
ItemIndex = 0 ItemIndex = 0
Items.Strings = ( Items.Strings = (
'HS box, L bar' 'HS box, L bar'
@ -140,32 +146,32 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
) )
OnChange = cbColorDisplayChange OnChange = cbColorDisplayChange
Style = csDropDownList Style = csDropDownList
TabOrder = 0 TabOrder = 1
Text = 'HS box, L bar' Text = 'HS box, L bar'
end end
object LHue: TLabel object LHue: TLabel
Left = 120 Left = 120
Height = 13 Height = 15
Top = 186 Top = 184
Width = 23 Width = 25
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Caption = '&Hue:' Caption = '&Hue:'
ParentColor = False ParentColor = False
end end
object LSat: TLabel object LSat: TLabel
Left = 120 Left = 120
Height = 13 Height = 15
Top = 212 Top = 210
Width = 20 Width = 19
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Caption = '&Sat:' Caption = '&Sat:'
ParentColor = False ParentColor = False
end end
object LLum: TLabel object LLum: TLabel
Left = 120 Left = 120
Height = 13 Height = 15
Top = 238 Top = 236
Width = 23 Width = 27
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Caption = 'L&um:' Caption = 'L&um:'
ParentColor = False ParentColor = False
@ -175,9 +181,9 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
Height = 132 Height = 132
Top = 22 Top = 22
Width = 220 Width = 220
PageIndex = 3 PageIndex = 0
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
TabOrder = 1 TabOrder = 0
object nbHSL: TPage object nbHSL: TPage
object HSL: THSLColorPicker object HSL: THSLColorPicker
Left = 0 Left = 0
@ -347,20 +353,24 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
Left = 254 Left = 254
Height = 32 Height = 32
Hint = 'RGB(255, 255, 255)' Hint = 'RGB(255, 255, 255)'
Top = 92 Top = 96
Width = 68 Width = 73
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
OnColorChange = NewSwatchColorChange OnColorChange = NewSwatchColorChange
end end
object OldSwatch: TmbColorPreview object OldSwatch: TmbColorPreview
AnchorSideLeft.Control = NewSwatch
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = NewSwatch
AnchorSideRight.Side = asrBottom
Left = 254 Left = 254
Height = 32 Height = 32
Hint = 'RGB(255, 255, 255)'#13#10'Hex: FFFFFF' Hint = 'RGB(255, 255, 255)'#13#10'Hex: FFFFFF'
Top = 123 Top = 127
Width = 68 Width = 73
Anchors = [akTop, akRight] Anchors = [akLeft, akRight]
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
OnColorChange = OldSwatchColorChange OnColorChange = OldSwatchColorChange

10
components/mbColorLib/OfficeMoreColorsDialog.pas
View File

@ -440,6 +440,7 @@ begin
MinValue := 0; MinValue := 0;
Value := 0; Value := 0;
OnChange := @ERedChange; OnChange := @ERedChange;
// TabOrder := cbColorDisplay.TabOrder + 1;
end; end;
with EGreen do with EGreen do
begin begin
@ -454,6 +455,7 @@ begin
MinValue := 0; MinValue := 0;
Value := 0; Value := 0;
OnChange := @EGreenChange; OnChange := @EGreenChange;
// TabOrder := ERed.TabOrder + 1;
end; end;
with EBlue do with EBlue do
begin begin
@ -468,6 +470,7 @@ begin
MinValue := 0; MinValue := 0;
Value := 0; Value := 0;
OnChange := @EBlueChange; OnChange := @EBlueChange;
// TabOrder := EGreen.TabOrder + 1;
end; end;
with EHue do with EHue do
begin begin
@ -482,6 +485,7 @@ begin
MinValue := 0; MinValue := 0;
Value := 0; Value := 0;
OnChange := @EHueChange; OnChange := @EHueChange;
// TabOrder := EBlue.TabOrder + 1;
end; end;
with ESat do with ESat do
begin begin
@ -496,6 +500,7 @@ begin
MinValue := 0; MinValue := 0;
Value := 0; Value := 0;
OnChange := @ESatChange; OnChange := @ESatChange;
// TabOrder := EHue.TabOrder + 1;
end; end;
with ELum do with ELum do
begin begin
@ -510,6 +515,7 @@ begin
MinValue := 0; MinValue := 0;
Value := 0; Value := 0;
OnChange := @ELumChange; OnChange := @ELumChange;
// TabOrder := ESat.TabOrder + 1;
end; end;
Custom.InsertControl(ERed); Custom.InsertControl(ERed);
Custom.InsertControl(EGreen); Custom.InsertControl(EGreen);
@ -517,6 +523,7 @@ begin
Custom.InsertControl(EHue); Custom.InsertControl(EHue);
Custom.InsertControl(ESat); Custom.InsertControl(ESat);
Custom.InsertControl(ELum); Custom.InsertControl(ELum);
{$IFDEF mbXP_Lib} {$IFDEF mbXP_Lib}
with grip do with grip do
begin begin
@ -529,6 +536,9 @@ begin
end; end;
InsertControl(grip); InsertControl(grip);
{$ENDIF} {$ENDIF}
OKBtn.TabOrder := ELum.TabOrder + 1;
CancelBtn.TabOrder := OKBtn.TabOrder + 1;
end; end;
end. end.