forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix, tab captions note update when closing doc from shortcut

This commit is contained in:
Basile Burg 2020-12-22 23:18:30 +01:00
parent 8503a81b16
commit 3b46ffb013
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
# v3.9.10-dev
## Bugs fixed
- Editor tabs: caption not updated when split page is closed using the File menu or the shortcut.
# v3.9.9 # v3.9.9
## Enhancement ## Enhancement

13
src/u_editor.pas
View File

@ -291,7 +291,7 @@ begin
with result do with result do
case index of case index of
0: begin identifier := 'Select next page'; shortcut:= fNextPage; end; 0: begin identifier := 'Select next page'; shortcut:= fNextPage; end;
1: begin identifier := 'Select previous page'; shortcut:= fPrevPage; end; 1: begin identifier := 'Select previous page'; shortcut:= fPrevPage; end;
2: begin identifier := 'Move page left'; shortcut:= fMoveLeft; end; 2: begin identifier := 'Move page left'; shortcut:= fMoveLeft; end;
3: begin identifier := 'Move page right'; shortcut:= fMoveRight; end; 3: begin identifier := 'Move page right'; shortcut:= fMoveRight; end;
else raise Exception.CreateFmt( else raise Exception.CreateFmt(
@ -502,6 +502,8 @@ begin
end; end;
procedure TEditorWidget.docClosing(document: TDexedMemo); procedure TEditorWidget.docClosing(document: TDexedMemo);
var
i: integer;
begin begin
if document.isNotAssigned then if document.isNotAssigned then
exit; exit;
@ -509,6 +511,8 @@ begin
if document = fDoc then if document = fDoc then
fDoc := nil; fDoc := nil;
pageControl.deletePage(pageControl.pageIndex); pageControl.deletePage(pageControl.pageIndex);
for i:= 0 to pageControl.pageCount-1 do
updatePageCaption(pageControl.pages[i]);
updateImperative; updateImperative;
end; end;
@ -813,7 +817,7 @@ procedure TEditorWidget.updateStatusBar;
const const
modstr: array[boolean] of string = ('...', 'MODIFIED'); modstr: array[boolean] of string = ('...', 'MODIFIED');
begin begin
if fDoc = nil then if fDoc.isNotAssigned then
begin begin
editorStatus.Panels[0].Text := ''; editorStatus.Panels[0].Text := '';
editorStatus.Panels[1].Text := ''; editorStatus.Panels[1].Text := '';
@ -867,8 +871,7 @@ procedure TEditorWidget.PageControlButtonClick(sender: TObject; button: TPageCon
var var
i: integer; i: integer;
begin begin
if ((button = pbClose) and (pageControl.currentPage = pageControl.splitPage)) if (button = pbClose) or (button = pbSplit) then
or (button = pbSplit) then
begin begin
for i:= 0 to pageControl.pageCount-1 do for i:= 0 to pageControl.pageCount-1 do
updatePageCaption(pageControl.pages[i]); updatePageCaption(pageControl.pages[i]);
@ -884,7 +887,7 @@ end;
procedure TEditorWidget.updateDelayed; procedure TEditorWidget.updateDelayed;
begin begin
if fDoc = nil then if fDoc.isNotAssigned then
exit; exit;
updateStatusBar; updateStatusBar;
if not fKeyChanged then if not fKeyChanged then