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

FIX: Drive free space label/indicator blinking

Browse source 
(cherry picked from commit 9b7b9c0bbf)
This commit is contained in:
Alexander Koblov 2021-11-06 23:49:03 +03:00
commit 82f9a739a2
1 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/fmain.pas
View file

@ -872,7 +872,7 @@ type
procedure ShowDrivesList(APanel: TFilePanelSelect);
procedure ExecuteCommandLine(bRunInTerm: Boolean);
procedure UpdatePrompt;
procedure UpdateFreeSpace(Panel: TFilePanelSelect);
procedure UpdateFreeSpace(Panel: TFilePanelSelect; Clear: Boolean);
procedure ReLoadTabs(ANoteBook: TFileViewNotebook);
procedure ShowOptionsLayout(Data: PtrInt);
procedure ToggleFullscreenConsole;
@ -1184,8 +1184,8 @@ begin
UpdateTreeView;
UpdateTreeViewPath;
UpdateSelectedDrives;
UpdateFreeSpace(fpLeft);
UpdateFreeSpace(fpRight);
UpdateFreeSpace(fpLeft, True);
UpdateFreeSpace(fpRight, True);
end;
procedure TfrmMain.btnLeftClick(Sender: TObject);
@ -2506,7 +2506,7 @@ begin
not (tb_activate_panel_on_click in gDirTabOptions) then
begin
UpdateSelectedDrive(Notebook);
UpdateFreeSpace(Notebook.Side);
UpdateFreeSpace(Notebook.Side, True);
end;
end;
@ -4456,7 +4456,7 @@ begin
Page := FileView.NotebookPage as TFileViewPage;
SelectedPanel := Page.Notebook.Side;
UpdateSelectedDrive(Page.Notebook);
UpdateFreeSpace(Page.Notebook.Side);
UpdateFreeSpace(Page.Notebook.Side, False);
end;
UpdateFileView;
end;
@ -4471,7 +4471,7 @@ begin
if Page.IsActive then
begin
UpdateFreeSpace(Page.Notebook.Side);
UpdateFreeSpace(Page.Notebook.Side, False);
end;
end;
end;
@ -5378,8 +5378,8 @@ begin
if FInitializedView then
begin
UpdateSelectedDrives;
UpdateFreeSpace(fpLeft);
UpdateFreeSpace(fpRight);
UpdateFreeSpace(fpLeft, True);
UpdateFreeSpace(fpRight, True);
end;
UpdateHotDirIcons; // Preferable to be loaded even if not required in popupmenu *because* in the tree it's a must, especially when checking for missing directories
@ -6431,25 +6431,31 @@ var
lblDriveInfo: TLabel;
AData: TFreeSpaceData absolute Data;
begin
if AData.Result then
case AData.Panel of
fpLeft :
begin
sboxDrive := pbxLeftDrive;
aFileView := FrameLeft;
lblDriveInfo :=lblLeftDriveInfo;
end;
fpRight:
begin
sboxDrive := pbxRightDrive;
aFileView := FrameRight;
lblDriveInfo := lblRightDriveInfo;
end;
end;
if mbCompareFileNames(AData.Path, aFileView.CurrentPath) then
begin
case AData.Panel of
fpLeft :
begin
sboxDrive := pbxLeftDrive;
aFileView := FrameLeft;
lblDriveInfo :=lblLeftDriveInfo;
end;
fpRight:
begin
sboxDrive := pbxRightDrive;
aFileView := FrameRight;
lblDriveInfo := lblRightDriveInfo;
end;
end;
if mbCompareFileNames(AData.Path, aFileView.CurrentPath) then
if not AData.Result then
begin
lblDriveInfo.Caption := '';
lblDriveInfo.Hint := '';
sboxDrive.Hint := '';
sboxDrive.Tag := -1;
sboxDrive.Invalidate;
end
else begin
if gDriveInd = True then
begin
if AData.TotalSize > 0 then
@ -6471,7 +6477,7 @@ begin
AData.Free;
end;
procedure TfrmMain.UpdateFreeSpace(Panel: TFilePanelSelect);
procedure TfrmMain.UpdateFreeSpace(Panel: TFilePanelSelect; Clear: Boolean);
var
aFileView: TFileView;
sboxDrive: TPaintBox;
@ -6483,7 +6489,7 @@ begin
begin
sboxDrive := pbxLeftDrive;
aFileView := FrameLeft;
lblDriveInfo := lblLeftDriveInfo;
lblDriveInfo :=lblLeftDriveInfo;
end;
fpRight:
begin
@ -6493,11 +6499,14 @@ begin
end;
end;
lblDriveInfo.Caption := ' ';
lblDriveInfo.Hint := ' ';
sboxDrive.Hint := ' ';
sboxDrive.Tag := -1;
sboxDrive.Invalidate;
if Clear then
begin
lblDriveInfo.Caption := '';
lblDriveInfo.Hint := '';
sboxDrive.Hint := '';
sboxDrive.Tag := -1;
sboxDrive.Invalidate;
end;
AData := TFreeSpaceData.Create;
AData.Panel := Panel;