diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index b8dd628720..c39462e722 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -135,7 +135,7 @@ void _SystemDiscs::Draw() { strcpy(#dev_name, list.get(i)); GetDiskIconAndName(dev_name[1], #dev_icon, #disc_name); - if (strstr(#path, #dev_name)) is_active=true; else is_active=false; + if (strstr(#path, #dev_name)-#path==0) is_active=true; else is_active=false; if (two_panels) { name_len = strlen(#dev_name)-1*8; diff --git a/programs/cmm/experimental/ttf_performance/compile.bat b/programs/cmm/experimental/ttf_performance/compile.bat deleted file mode 100644 index 7d33833abd..0000000000 --- a/programs/cmm/experimental/ttf_performance/compile.bat +++ /dev/null @@ -1,10 +0,0 @@ -C-- ttf_performance.c -@del ttf_performance -@rename ttf_performance.com ttf_performance -kpack ttf_performance -@del warning.txt -@pause -@rem ====== Automatically add binnary to kolibri.img and then run QEMU ===== -"C:\Program Files (x86)\WinImage\WINIMAGE.exe" D:\Kolibri\work\QEMU\kolibri.img /I /H/Q C:\Users\lee\Desktop\CMM\ttf_performance\ttf_performance -@cd /d D:\Kolibri\work\QEMU -D:\Kolibri\work\QEMU\qemu-kos-img.bat \ No newline at end of file diff --git a/programs/cmm/experimental/ttf_performance/ttf_performance.c b/programs/cmm/experimental/ttf_performance/ttf_performance.c deleted file mode 100644 index 001531b3cc..0000000000 --- a/programs/cmm/experimental/ttf_performance/ttf_performance.c +++ /dev/null @@ -1,89 +0,0 @@ -#define MEMSIZE 397113 -#include "../lib/kolibri.h" -#include "../lib/strings.h" -#include "../lib/mem.h" -#include "../lib/file_system.h" -#include "../lib/dll.h" -#include "../lib/obj/truetype.h" - -proc_info Form; -dword font_data; -stbtt_fontinfo font_info; - - -inline fastcall dword get_start_time() -{ - $mov eax,26 - $mov ebx,9 - $int 0x40 -} - -#define TESTS_NUM 10 -char test_text[] = "The quick brown fox jumps over the lazy dog"; -word rez[TESTS_NUM]; - -void main() -{ - BDVK FontFile_atr; - int id, key; - - mem_Init(); - if (load_dll2(libtruetype, #truetype, 1) != 0) notify("Error: library doesn't exists - truetype"); - - if (param[0]==0) strcpy(#param, "/sys/arial.ttf"); - GetFileInfo(#param, #FontFile_atr); - font_data = malloc(FontFile_atr.sizelo); - ReadFile(0, FontFile_atr.sizelo, #font_data, #param); - - init_font stdcall (#font_info, #font_data); - if (EAX==0) notify("init_font failed"); - - loop() - { - switch(WaitEvent()) - { - case evButton: - id=GetButtonID(); - if (id==1) ExitProcess(); - break; - - case evKey: - key = GetKey(); - IF (key==013){ //Enter - debug("Tests count: "); - debugi(TESTS_NUM); - for (id=0; id