Skip to content

Commit bef8f9f

Browse files
committed
Fixed issue #805: implify code for changing the checkstate
1 parent 878c110 commit bef8f9f

File tree

3 files changed

+38
-142
lines changed

3 files changed

+38
-142
lines changed

Demos/Advanced/States.dfm

+17-45
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ object StateForm: TStateForm
7777
TabOrder = 2
7878
object CheckBox8: TCheckBox
7979
Left = 10
80-
Top = 118
80+
Top = 101
8181
Width = 190
8282
Height = 17
8383
Caption = 'Draw selection pending'
@@ -86,7 +86,7 @@ object StateForm: TStateForm
8686
end
8787
object CheckBox9: TCheckBox
8888
Left = 10
89-
Top = 135
89+
Top = 118
9090
Width = 190
9191
Height = 17
9292
Caption = 'Draw selecting'
@@ -102,50 +102,41 @@ object StateForm: TStateForm
102102
Enabled = False
103103
TabOrder = 2
104104
end
105-
object CheckBox20: TCheckBox
106-
Left = 10
107-
Top = 33
108-
Width = 190
109-
Height = 17
110-
Caption = 'Mouse check pending'
111-
Enabled = False
112-
TabOrder = 3
113-
end
114105
object CheckBox21: TCheckBox
115106
Left = 10
116-
Top = 50
107+
Top = 33
117108
Width = 190
118109
Height = 17
119110
Caption = 'Middle mouse button down'
120111
Enabled = False
121-
TabOrder = 4
112+
TabOrder = 3
122113
end
123114
object CheckBox27: TCheckBox
124115
Left = 10
125-
Top = 67
116+
Top = 50
126117
Width = 190
127118
Height = 17
128119
Caption = 'Right mouse button down'
129120
Enabled = False
130-
TabOrder = 5
121+
TabOrder = 4
131122
end
132123
object CheckBox43: TCheckBox
133124
Left = 10
134-
Top = 84
125+
Top = 67
135126
Width = 190
136127
Height = 17
137128
Caption = 'Mouse wheel panning'
138129
Enabled = False
139-
TabOrder = 6
130+
TabOrder = 5
140131
end
141132
object CheckBox44: TCheckBox
142133
Left = 10
143-
Top = 101
134+
Top = 84
144135
Width = 190
145136
Height = 17
146137
Caption = 'Mouse wheel scrolling'
147138
Enabled = False
148-
TabOrder = 7
139+
TabOrder = 6
149140
end
150141
end
151142
object GroupBox3: TGroupBox
@@ -175,7 +166,7 @@ object StateForm: TStateForm
175166
end
176167
object CheckBox15: TCheckBox
177168
Left = 10
178-
Top = 84
169+
Top = 16
179170
Width = 174
180171
Height = 17
181172
Caption = 'Incremental search in progress'
@@ -191,15 +182,6 @@ object StateForm: TStateForm
191182
Enabled = False
192183
TabOrder = 3
193184
end
194-
object CheckBox18: TCheckBox
195-
Left = 10
196-
Top = 16
197-
Width = 174
198-
Height = 17
199-
Caption = 'Key check pending'
200-
Enabled = False
201-
TabOrder = 4
202-
end
203185
end
204186
object GroupBox4: TGroupBox
205187
Left = 223
@@ -438,24 +420,14 @@ object StateForm: TStateForm
438420
Height = 143
439421
Caption = ' Window related actions: '
440422
TabOrder = 8
441-
object CheckBox22: TCheckBox
442-
Left = 10
443-
Top = 118
444-
Width = 190
445-
Height = 17
446-
Caption = 'Default node height scale'
447-
Enabled = False
448-
TabOrder = 0
449-
Visible = False
450-
end
451423
object CheckBox26: TCheckBox
452424
Left = 10
453425
Top = 67
454426
Width = 190
455427
Height = 17
456428
Caption = 'Tree painting'
457429
Enabled = False
458-
TabOrder = 1
430+
TabOrder = 0
459431
end
460432
object CheckBox30: TCheckBox
461433
Left = 10
@@ -464,7 +436,7 @@ object StateForm: TStateForm
464436
Height = 17
465437
Caption = 'Window resizing'
466438
Enabled = False
467-
TabOrder = 2
439+
TabOrder = 1
468440
end
469441
object CheckBox34: TCheckBox
470442
Left = 10
@@ -473,7 +445,7 @@ object StateForm: TStateForm
473445
Height = 17
474446
Caption = 'Tumb tracking (scrollbar)'
475447
Enabled = False
476-
TabOrder = 3
448+
TabOrder = 2
477449
end
478450
object CheckBox35: TCheckBox
479451
Left = 10
@@ -482,7 +454,7 @@ object StateForm: TStateForm
482454
Height = 17
483455
Caption = 'Updates locked'
484456
Enabled = False
485-
TabOrder = 4
457+
TabOrder = 3
486458
end
487459
object CheckBox38: TCheckBox
488460
Left = 10
@@ -491,7 +463,7 @@ object StateForm: TStateForm
491463
Height = 17
492464
Caption = 'Windows XP Theme support in use'
493465
Enabled = False
494-
TabOrder = 5
466+
TabOrder = 4
495467
end
496468
object CheckBox45: TCheckBox
497469
Left = 10
@@ -500,7 +472,7 @@ object StateForm: TStateForm
500472
Height = 17
501473
Caption = 'Treewindow is under construction'
502474
Enabled = False
503-
TabOrder = 6
475+
TabOrder = 5
504476
end
505477
end
506478
end

Demos/Advanced/States.pas

-9
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ TStateForm = class(TForm)
1818
CheckBox8: TCheckBox;
1919
CheckBox9: TCheckBox;
2020
CheckBox19: TCheckBox;
21-
CheckBox20: TCheckBox;
2221
CheckBox21: TCheckBox;
2322
CheckBox27: TCheckBox;
2423
CheckBox43: TCheckBox;
@@ -28,7 +27,6 @@ TStateForm = class(TForm)
2827
CheckBox11: TCheckBox;
2928
CheckBox15: TCheckBox;
3029
CheckBox16: TCheckBox;
31-
CheckBox18: TCheckBox;
3230
GroupBox4: TGroupBox;
3331
CheckBox5: TCheckBox;
3432
CheckBox6: TCheckBox;
@@ -55,7 +53,6 @@ TStateForm = class(TForm)
5553
CheckBox23: TCheckBox;
5654
CheckBox33: TCheckBox;
5755
GroupBox8: TGroupBox;
58-
CheckBox22: TCheckBox;
5956
CheckBox26: TCheckBox;
6057
CheckBox30: TCheckBox;
6158
CheckBox34: TCheckBox;
@@ -109,11 +106,8 @@ procedure UpdateStateDisplay(CurrentStates, Enter, Leave: TVirtualTreeStates);
109106
SetActiveState(CheckBox15, tsIncrementalSearching in NewStates);
110107
SetActiveState(CheckBox16, tsIncrementalSearchPending in NewStates);
111108
SetActiveState(CheckBox17, tsIterating in NewStates);
112-
SetActiveState(CheckBox18, tsKeyCheckPending in NewStates);
113109
SetActiveState(CheckBox19, tsLeftButtonDown in NewStates);
114-
SetActiveState(CheckBox20, tsMouseCheckPending in NewStates);
115110
SetActiveState(CheckBox21, tsMiddleButtonDown in NewStates);
116-
//SetActiveState(CheckBox22, tsNeedScale in NewStates);
117111
SetActiveState(CheckBox23, tsNeedRootCountUpdate in NewStates);
118112
SetActiveState(CheckBox24, tsOLEDragging in NewStates);
119113
SetActiveState(CheckBox25, tsOLEDragPending in NewStates);
@@ -165,11 +159,8 @@ procedure TStateForm.EnableCheckBoxClick(Sender: TObject);
165159
CheckBox15.Enabled := EnableCheckBox.Checked;
166160
CheckBox16.Enabled := EnableCheckBox.Checked;
167161
CheckBox17.Enabled := EnableCheckBox.Checked;
168-
CheckBox18.Enabled := EnableCheckBox.Checked;
169162
CheckBox19.Enabled := EnableCheckBox.Checked;
170-
CheckBox20.Enabled := EnableCheckBox.Checked;
171163
CheckBox21.Enabled := EnableCheckBox.Checked;
172-
CheckBox22.Enabled := EnableCheckBox.Checked;
173164
CheckBox23.Enabled := EnableCheckBox.Checked;
174165
CheckBox24.Enabled := EnableCheckBox.Checked;
175166
CheckBox25.Enabled := EnableCheckBox.Checked;

0 commit comments

Comments
 (0)