ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/branches/journaling/ibcontrols/IBLookupComboEditBox.pas
(Generate patch)

Comparing ibx/trunk/ibcontrols/IBLookupComboEditBox.pas (file contents):
Revision 143 by tony, Fri Feb 23 12:11:21 2018 UTC vs.
Revision 266 by tony, Wed Dec 26 18:34:32 2018 UTC

# Line 30 | Line 30 | unit IBLookupComboEditBox;
30   interface
31  
32   uses
33 <  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, DbCtrls,
33 >  Classes, SysUtils, LCLType, LResources, Forms, Controls, Graphics, Dialogs, DbCtrls,
34    ExtCtrls, IBSQLParser, DB, StdCtrls, IBCustomDataSet, LCLVersion;
35  
36   type
# Line 54 | Line 54 | type
54      FOwner: TIBLookupComboEditBox;
55    protected
56      procedure ActiveChanged; override;
57 +    procedure DataEvent(Event: TDataEvent; Info: Ptrint); override;
58      procedure RecordChanged(Field: TField); override;
59      procedure UpdateData; override;
60    public
# Line 76 | Line 77 | type
77  
78    TIBLookupComboEditBox = class(TDBLookupComboBox)
79    private
79 –    FCanAutoInsert: TCanAutoInsert;
80      { Private declarations }
81      FDataLink: TIBLookupComboDataLink;
82      FIBLookupControlLink: TIBLookupControlLink;
# Line 117 | Line 117 | type
117      procedure CheckAndInsert;
118      procedure DoEnter; override;
119      procedure DoExit; override;
120 +    {$if lcl_fullversion >= 2000000}
121 +    {Deferred update changes in Lazarus 2.0 stop the combo box working when
122 +     the datasource is nil. We thus have to reverse out the changes :(}
123 +    function DoEdit: boolean; override;
124 +    procedure Change; override;
125 +    procedure CloseUp; override;
126 +    procedure Select; override;
127 +    {$ifend}
128      procedure KeyUp(var Key: Word; Shift: TShiftState); override;
129      procedure Loaded; override;
130      procedure Notification(AComponent: TComponent; Operation: TOperation); override;
# Line 147 | Line 155 | type
155  
156   implementation
157  
158 < uses IBQuery, LCLType, Variants, LCLProc, LazUTF8;
158 > uses Variants, LCLProc, LazUTF8;
159  
160   { TIBLookupControlLink }
161  
# Line 169 | Line 177 | begin
177    FOwner.ActiveChanged(self)
178   end;
179  
180 + procedure TIBLookupComboDataLink.DataEvent(Event: TDataEvent; Info: Ptrint);
181 + begin
182 +  inherited DataEvent(Event, Info);
183 +  if Event = deLayoutChange then
184 +   FOwner.LookupCache := FOwner.LookupCache; {sneaky way of calling UpdateLookup}
185 + end;
186 +
187   procedure TIBLookupComboDataLink.RecordChanged(Field: TField);
188   begin
189    FOwner.RecordChanged(self,Field);
# Line 188 | Line 203 | end;
203   { TIBLookupComboEditBox }
204  
205   procedure TIBLookupComboEditBox.HandleTimer(Sender: TObject);
191 – var ActiveState: boolean;
206   begin
207    FTimer.Interval := 0;
208    FFiltered := Text <> '';
# Line 339 | Line 353 | begin
353               sCompleteText := ListSource.DataSet.FieldByName(ListField).AsString;
354               if (sCompleteText <> FCurText) then
355               begin
356 +               KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
357                 sResultText := sCompleteText;
358                 if ((cbactEndOfLineComplete in AutoCompleteText) and
359                           (cbactRetainPrefixCase in AutoCompleteText)) then
# Line 348 | Line 363 | begin
363                 end;
364                 Text := sResultText;
365                 SelStart := iSelStart;
366 <               SelLength := UTF8Length(Text);
366 >               SelLength := UTF8Length(Text) - iSelStart;
367               end;
353 –             KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
368             end
369             else
370             begin
# Line 495 | Line 509 | end;
509   procedure TIBLookupComboEditBox.KeyUp(var Key: Word; Shift: TShiftState);
510   begin
511    inherited KeyUp(Key, Shift);
498 –  if Key = VK_RETURN then
499 –     EditingDone
500 –  else
512    if Key = VK_ESCAPE then
513    begin
514      SelStart := UTF8Length(Text);      {Ensure end of line selection}
# Line 506 | Line 517 | begin
517      SelectAll;
518    end
519    else
520 +  if AutoComplete and (Style <> csDropDownList) then
521    begin
522 <    FTimer.Interval := 0;
523 <    if (IsEditableTextKey(Key) or (Key = VK_BACK))
524 <       and AutoComplete and (Style <> csDropDownList) and
525 <       (not (cbactEndOfLineComplete in AutoCompleteText) or (SelStart = UTF8Length(Text))) then
522 >    if (Key = VK_BACK) or (Key = VK_DELETE) then
523 >    begin
524 >      if SelStart = 0 then
525 >      begin
526 >        SelStart := UTF8Length(Text);
527 >        SelLength := 0;
528 >      end;
529 >      FTimer.Interval := 0;
530 >    end
531 >    else
532 >    if IsEditableTextKey(Key) and
533 >     (not(cbactEndOfLineComplete in AutoCompleteText) or (SelStart = UTF8Length(Text))) then
534 >    begin
535 >      FTimer.Interval := 0;
536        FTimer.Interval := FKeyPressInterval;
537 +    end;
538    end;
539   end;
540  
# Line 531 | Line 554 | end;
554  
555   procedure TIBLookupComboEditBox.SetItemIndex(const Val: integer);
556   begin
557 +  if Val > 0 then
558 +    FCurText := '';
559    inherited SetItemIndex(Val);
560    FLastKeyValue := KeyValue;
561   end;
# Line 556 | Line 581 | end;
581   procedure TIBLookupComboEditBox.UpdateData(Sender: TObject);
582   begin
583    inherited UpdateData(Sender);
584 +  if FCurText <> '' then
585 +    Text := FCurText + Text;
586    FModified := false;
587   end;
588  
589 + {$if lcl_fullversion >= 2000000}
590 + type
591 +
592 +  { THackedCustomComboBox }
593 +
594 +  THackedCustomComboBox = class(TCustomComboBox)
595 +  private
596 +    procedure CallChange;
597 +  end;
598 +
599 + { THackedCustomComboBox }
600 +
601 + procedure THackedCustomComboBox.CallChange;
602 + begin
603 +  inherited Change;
604 + end;
605 +
606 + procedure TIBLookupComboEditBox.Change;
607 + begin
608 +  THackedCustomComboBox(self).CallChange;
609 + end;
610 +
611 + procedure TIBLookupComboEditBox.CloseUp;
612 + begin
613 +  inherited CloseUp;
614 +  inherited DoEdit;
615 + end;
616 +
617 + procedure TIBLookupComboEditBox.Select;
618 + begin
619 +  inherited Select;
620 +  inherited DoEdit;
621 + end;
622 +
623 + function TIBLookupComboEditBox.DoEdit: boolean;
624 + begin
625 +  {DoEdit will swallow characters if no editable Field. Hence, to enabled
626 +   writing we must avoid calling the inherited method.}
627 +  if IsUnbound then
628 +    Result := true
629 +  else
630 +    Result := inherited DoEdit;
631 + end;
632 + {$ifend}
633 +
634   constructor TIBLookupComboEditBox.Create(TheComponent: TComponent);
635   begin
636    inherited Create(TheComponent);
# Line 591 | Line 663 | begin
663      FForceAutoComplete := false;
664    end;
665    CheckAndInsert;
666 +  FCurText := '';
667    if FModified then
668      Change; {ensure Update}
669    inherited EditingDone;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines