mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: workaround for IME in fileview (F2) are removed by the update of Lazarus Lcl (issue 40008) (#975)

Browse source
This commit is contained in:
rich2014 2023-05-07 17:12:15 +08:00 • committed by GitHub
commit 951f4047db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/fileviews/ufileviewwithmainctrl.pas
View file

@ -19,14 +19,6 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Notes:
1. PR #550 #556 are the workaround for the bug of Lazarus.
related codes can be removed after Lazarus merges related Patches.
see also:
https://github.com/doublecmd/doublecmd/pull/550
https://github.com/doublecmd/doublecmd/pull/556
https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/40008
}
unit uFileViewWithMainCtrl;
@ -69,10 +61,6 @@ type
TEditButtonEx = class(TEditButton)
private
{$IFDEF LCLCOCOA}
originalText: String;
keyDownText: String;
{$ENDIF}
procedure handleSpecialKeys( Key: Word );
function GetFont: TFont;
procedure SetFont(AValue: TFont);
@ -80,11 +68,6 @@ type
function CalcButtonVisible: Boolean; override;
function GetDefaultGlyphName: String; override;
procedure EditKeyDown(var Key: word; Shift: TShiftState); override;
{$IFDEF LCLCOCOA}
procedure EditEnter; override;
procedure EditChange; override;
procedure EditKeyUp(var Key: word; Shift: TShiftState); override;
{$ENDIF}
public
onKeyESCAPE: TNotifyEvent;
onKeyRETURN: TNotifyEvent;
@ -258,49 +241,6 @@ type
{ TEditButtonEx }
{$IFDEF LCLCOCOA}
procedure TEditButtonEx.EditEnter;
begin
inherited EditEnter;
self.originalText:= self.Text;
end;
procedure TEditButtonEx.EditChange;
begin
inherited EditChange;
self.originalText:= self.Text;
end;
procedure TEditButtonEx.EditKeyDown( var Key: Word; Shift: TShiftState );
begin
case Key of
VK_ESCAPE:
self.keyDownText:= self.Text;
VK_RETURN,
VK_SELECT:
self.keyDownText:= self.originalText
end;
inherited EditKeyDown( Key, Shift );
end;
procedure TEditButtonEx.EditKeyUp( var Key: Word; Shift: TShiftState );
begin
case Key of
VK_ESCAPE,
VK_RETURN,
VK_SELECT:
if self.text=self.keyDownText then
// from the text has not been changed,
// the EditButton is not in the IME state
handleSpecialKeys( Key )
else
Key:= 0;
end;
inherited EditKeyUp( Key, Shift );
end;
{$ELSE}
procedure TEditButtonEx.EditKeyDown(var Key: Word; Shift: TShiftState);
begin
inherited EditKeyDown(Key, Shift);
@ -320,8 +260,6 @@ begin
end;
end;
{$ENDIF}
procedure TEditButtonEx.handleSpecialKeys( Key: Word );
begin
if Key=VK_ESCAPE then begin