paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-24 17:40:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: Fixed Syncro edit / issue from rev 35955 #9b1daa010e

Browse Source 
git-svn-id: trunk@36149 -
This commit is contained in:
martin 2012-03-18 17:51:28 +00:00
parent 5cc8988523
commit 3ef7a4d9e1
3 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/synedit/synpluginsyncroedit.pp
View File

@ -227,7 +227,8 @@ type
function DoHandleMouseAction(AnAction: TSynEditMouseAction;
var AnInfo: TSynEditMouseActionInfo): Boolean;
procedure SetEditor(const AValue: TCustomSynEdit); override;
procedure DoEditorRemoving(AValue: TCustomSynEdit); override;
procedure DoEditorAdded(AValue: TCustomSynEdit); override;
procedure DoClear; override;
procedure DoModeChanged;
@ -1289,9 +1290,8 @@ begin
end;
end;
procedure TSynPluginSyncroEdit.SetEditor(const AValue: TCustomSynEdit);
procedure TSynPluginSyncroEdit.DoEditorRemoving(AValue: TCustomSynEdit);
begin
if Editor = AValue then exit;
if Editor <> nil then begin
SelectionObj.RemoveChangeHandler(@DoSelectionChanged);
Editor.UnregisterCommandHandler(@ProcessSynCommand);
@ -1300,7 +1300,12 @@ begin
Editor.UnregisterMouseActionExecHandler(@DoHandleMouseAction);
FLowerLines.Lines := nil;
end;
inherited SetEditor(AValue);
inherited DoEditorRemoving(AValue);
end;
procedure TSynPluginSyncroEdit.DoEditorAdded(AValue: TCustomSynEdit);
begin
inherited DoEditorAdded(AValue);
if Editor <> nil then begin
FLowerLines.Lines := ViewedTextBuffer;
Editor.RegisterMouseActionSearchHandler(@MaybeHandleMouseAction);

58
components/synedit/synpluginsyncronizededitbase.pp
View File

@ -172,6 +172,7 @@ type
FEditing: Boolean;
FPaintLock: Integer;
FOwnPaintLock: Integer;
FTextBufferChanging: Boolean;
fMarkupInfo: TSynSelectedColor;
fMarkupInfoSync: TSynSelectedColor;
@ -196,7 +197,10 @@ type
FMarkupArea: TSynPluginSyncronizedEditMarkupArea;
procedure MarkupChanged(AMarkup: TObject);
function CreateMarkup: TSynPluginSyncronizedEditMarkup; virtual;
procedure SetEditor(const AValue: TCustomSynEdit); override;
procedure DoEditorRemoving(AValue: TCustomSynEdit); override;
procedure DoEditorAdded(AValue: TCustomSynEdit); override;
procedure DoBufferChanging(Sender: TObject);
procedure DoBufferChanged(Sender: TObject);
procedure DoLinesEdited(Sender: TSynEditStrings; aLinePos, aBytePos, aCount,
aLineBrkCnt: Integer; aText: String);
procedure ApplyChangeList;
@ -247,7 +251,8 @@ type
FExternalEditLock: Integer;
protected
procedure SetUndoStart; // Handle undo/redo stuff
procedure SetEditor(const AValue: TCustomSynEdit); override;
procedure DoEditorRemoving(AValue: TCustomSynEdit); override;
procedure DoEditorAdded(AValue: TCustomSynEdit); override;
procedure DoOnActivate; override;
procedure DoOnDeactivate; override;
procedure DoBeforeEdit(aX, aY, aCount, aLineBrkCnt: Integer; aUndoRedo: Boolean); override;
@ -712,6 +717,7 @@ begin
FEnabled := True;
Active := False;
FEditing := False;
FTextBufferChanging := False;
end;
destructor TSynPluginSyncronizedEditBase.Destroy;
@ -736,11 +742,14 @@ begin
DoClear;
end;
procedure TSynPluginSyncronizedEditBase.SetEditor(const AValue: TCustomSynEdit);
procedure TSynPluginSyncronizedEditBase.DoEditorRemoving(AValue: TCustomSynEdit);
begin
if AValue = Editor then exit;
Active := False;
if Editor <> nil then begin
if not FTextBufferChanging then begin
ViewedTextBuffer.RemoveGenericHandler(senrTextBufferChanging, TMethod({$IFDEF FPC}@{$ENDIF}DoBufferChanging));
ViewedTextBuffer.RemoveGenericHandler(senrTextBufferChanged, TMethod({$IFDEF FPC}@{$ENDIF}DoBufferChanged));
end;
ViewedTextBuffer.RemoveEditHandler(@DoLinesEdited);
ViewedTextBuffer.RemoveNotifyHandler(senrAfterIncPaintLock, @DoIncPaintLock);
ViewedTextBuffer.RemoveNotifyHandler(senrBeforeDecPaintLock, @DoDecPaintLock);
@ -753,8 +762,13 @@ begin
FreeAndNil(FMarkupArea);
end;
end;
inherited SetEditor(AValue);
if AValue <> nil then begin
inherited DoEditorRemoving(AValue);
end;
procedure TSynPluginSyncronizedEditBase.DoEditorAdded(AValue: TCustomSynEdit);
begin
inherited DoEditorAdded(AValue);
if Editor <> nil then begin
FMarkup := CreateMarkup;
FMarkup.Cells := FCells;
FMarkup.CurrentCell := FCurrentCell;
@ -768,9 +782,31 @@ begin
ViewedTextBuffer.AddEditHandler(@DoLinesEdited);
ViewedTextBuffer.AddNotifyHandler(senrAfterIncPaintLock, @DoIncPaintLock);
ViewedTextBuffer.AddNotifyHandler(senrBeforeDecPaintLock, @DoDecPaintLock);
if not FTextBufferChanging then begin
ViewedTextBuffer.AddGenericHandler(senrTextBufferChanging, TMethod({$IFDEF FPC}@{$ENDIF}DoBufferChanging));
ViewedTextBuffer.AddGenericHandler(senrTextBufferChanged, TMethod({$IFDEF FPC}@{$ENDIF}DoBufferChanged));
end;
end;
end;
procedure TSynPluginSyncronizedEditBase.DoBufferChanging(Sender: TObject);
begin
if FTextBufferChanging then
exit;
FTextBufferChanging := True;
if Editor <> nil then
DoEditorRemoving(Editor);
end;
procedure TSynPluginSyncronizedEditBase.DoBufferChanged(Sender: TObject);
begin
if not FTextBufferChanging then
exit;
if Editor <> nil then
DoEditorAdded(Editor);
FTextBufferChanging := False;
end;
procedure TSynPluginSyncronizedEditBase.SetCurrentCell(const AValue: Integer);
begin
if FCurrentCell = AValue then exit;
@ -1109,13 +1145,17 @@ begin
FRedoRealCount := ViewedTextBuffer.RedoList.RealCount;
end;
procedure TSynPluginCustomSyncroEdit.SetEditor(const AValue: TCustomSynEdit);
procedure TSynPluginCustomSyncroEdit.DoEditorRemoving(AValue: TCustomSynEdit);
begin
if Editor = AValue then exit;
if Editor <> nil then begin
CaretObj.RemoveChangeHandler(@DoCaretChanged);
end;
inherited SetEditor(AValue);
inherited DoEditorRemoving(AValue);
end;
procedure TSynPluginCustomSyncroEdit.DoEditorAdded(AValue: TCustomSynEdit);
begin
inherited DoEditorAdded(AValue);
if Editor <> nil then begin
CaretObj.AddChangeHandler(@DoCaretChanged);
end;

13
components/synedit/synplugintemplateedit.pp
View File

@ -56,7 +56,8 @@ type
procedure SetKeystrokes(const AValue: TSynEditKeyStrokes);
procedure SetKeystrokesOffCell(const AValue: TSynEditKeyStrokes);
protected
procedure SetEditor(const AValue: TCustomSynEdit); override;
procedure DoEditorRemoving(AValue: TCustomSynEdit); override;
procedure DoEditorAdded(AValue: TCustomSynEdit); override;
procedure TranslateKey(Sender: TObject; Code: word; SState: TShiftState;
var Data: pointer; var IsStartOfCombo: boolean; var Handled: boolean;
var Command: TSynEditorCommand; FinishComboOnly: Boolean;
@ -141,14 +142,18 @@ begin
else Result := ecNone;
end;
procedure TSynPluginTemplateEdit.SetEditor(const AValue: TCustomSynEdit);
procedure TSynPluginTemplateEdit.DoEditorRemoving(AValue: TCustomSynEdit);
begin
if Editor = AValue then exit;
if Editor <> nil then begin
Editor.UnRegisterKeyTranslationHandler(@TranslateKey);
Editor.UnregisterCommandHandler(@ProcessSynCommand);
end;
inherited SetEditor(AValue);
inherited DoEditorRemoving(AValue);
end;
procedure TSynPluginTemplateEdit.DoEditorAdded(AValue: TCustomSynEdit);
begin
inherited DoEditorAdded(AValue);
if Editor <> nil then begin
Editor.RegisterCommandHandler(@ProcessSynCommand, nil);
Editor.RegisterKeyTranslationHandler(@TranslateKey);