ramenu/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

KFM2 RC1: bugfixes, less redraw, faster disk dropdown open

Browse Source 
git-svn-id: svn://kolibrios.org@8902 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-06-21 10:17:09 +00:00
parent 13168e73dc
commit 8ece03fb87
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
programs/cmm/eolite/Eolite.c
View File

@ -3,9 +3,9 @@
// 70.5 - get volume info and label // 70.5 - get volume info and label
#define ABOUT_TITLE "EOLITE 5 Beta7" #define ABOUT_TITLE "EOLITE 5 Beta8"
#define TITLE_EOLITE "Eolite File Manager 5 Beta7" #define TITLE_EOLITE "Eolite File Manager 5 Beta8"
#define TITLE_KFM "Kolibri File Manager 2 Beta7"; #define TITLE_KFM "Kolibri File Manager 2 Beta8";
#define MEMSIZE 1024 * 250 #define MEMSIZE 1024 * 250
#include "../lib/clipboard.h" #include "../lib/clipboard.h"
@ -333,7 +333,7 @@ void main()
break; break;
} }
if (efm) && (mouse.y > files.y) && (mouse.y < files.y + files.h) && (mouse.down) { if (efm) && (mouse.y < files.y + files.h) && (mouse.down) {
if (mouse.x<Form.cwidth/2) { if (mouse.x<Form.cwidth/2) {
if (active_panel!=1) ChangeActivePanel(); if (active_panel!=1) ChangeActivePanel();
} else { } else {
@ -490,7 +490,7 @@ void main()
EventOpenNewEolite(); EventOpenNewEolite();
break; break;
case SCAN_CODE_KEY_R: case SCAN_CODE_KEY_R:
EventRefresh(); EventRefreshDisksAndFolders();
break; break;
case SCAN_CODE_ENTER: case SCAN_CODE_ENTER:
if (!itdir) ShowOpenWithDialog(); if (!itdir) ShowOpenWithDialog();
@ -713,6 +713,7 @@ void DrawFilePanels()
files.SetSizes(Form.cwidth/2, files_y, w2-17, h2, files.item_h); files.SetSizes(Form.cwidth/2, files_y, w2-17, h2, files.item_h);
DrawButtonsAroundList(); DrawButtonsAroundList();
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
files_inactive.count = files.count;
llist_copy(#files, #files_active); llist_copy(#files, #files_active);
strcpy(#path, #active_path); strcpy(#path, #active_path);
col.selec = col.selec_active; col.selec = col.selec_active;
@ -725,6 +726,7 @@ void DrawFilePanels()
files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h); files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
DrawButtonsAroundList(); DrawButtonsAroundList();
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
files_inactive.count = files.count;
llist_copy(#files, #files_active); llist_copy(#files, #files_active);
strcpy(#path, #active_path); strcpy(#path, #active_path);
col.selec = col.selec_active; col.selec = col.selec_active;
@ -1189,7 +1191,7 @@ void FnProcess(byte N)
CopyFilesListToClipboard(COPY); CopyFilesListToClipboard(COPY);
EventPaste(#inactive_path); EventPaste(#inactive_path);
} else { } else {
EventRefresh(); EventRefreshDisksAndFolders();
} }
break; break;
case 6: case 6:
@ -1231,8 +1233,6 @@ void EventRefresh()
Tip(56, T_DEVICES, 55, "-"); Tip(56, T_DEVICES, 55, "-");
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
pause(10); pause(10);
SystemDiscs.Get();
Open_Dir(#path,WITH_REDRAW);
DrawDeviceAndActionsLeftPanel(); DrawDeviceAndActionsLeftPanel();
} }
} }
@ -1287,16 +1287,14 @@ int GetRealFileCountInFolder(dword folder_path)
void EventRefreshDisksAndFolders() void EventRefreshDisksAndFolders()
{ {
if(GetRealFileCountInFolder("/")+dir_exists("/kolibrios") != SystemDiscs.dev_num) { if(GetRealFileCountInFolder("/")+dir_exists("/kolibrios") != SystemDiscs.dev_num) {
SystemDiscs.Get();
EventRefresh(); EventRefresh();
} } else {
if(efm) if(GetRealFileCountInFolder(#path) != files.count) EventRefresh();
{ else if(efm) && (GetRealFileCountInFolder(#inactive_path) != files_inactive.count) {
if(GetRealFileCountInFolder(#inactive_path) != files_inactive.count) { EventRefresh();
ChangeActivePanel();
ChangeActivePanel();
} }
} }
if(GetRealFileCountInFolder(#path) != files.count) Open_Dir(#path,WITH_REDRAW);
} }
void EventSort(dword id) void EventSort(dword id)
@ -1459,7 +1457,6 @@ void EventOpenDiskPopin(int panel_n)
{ {
DefineHiddenButton(0,0,5000,3000,9999+BT_NOFRAME); DefineHiddenButton(0,0,5000,3000,9999+BT_NOFRAME);
disk_popin_active_on_panel = panel_n; disk_popin_active_on_panel = panel_n;
SystemDiscs.Get();
if (disk_popin_active_on_panel==1) { if (disk_popin_active_on_panel==1) {
SystemDiscs.DrawOptions(Form.cwidth/2-DDW, 8+DEV_H_HOR+3); SystemDiscs.DrawOptions(Form.cwidth/2-DDW, 8+DEV_H_HOR+3);
} else { } else {