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

10
components/mbColorLib/OfficeMoreColorsDialog.pas
View File

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