From 0800eed3a9056430d838a039a0932d7aab01b789 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 27 May 2012 11:37:20 +0000 Subject: [PATCH] Eolite: small changes git-svn-id: svn://kolibrios.org@2695 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/fs/Eolite/trunk/Eolite.c-- | 15 +-------------- programs/fs/Eolite/trunk/include/about_dialog.h | 4 +++- programs/fs/Eolite/trunk/include/icons_f.h | 2 +- programs/fs/Eolite/trunk/include/some_code.h | 12 ++++++++++++ 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c-- index 523089391c..6e7264ffe7 100644 --- a/programs/fs/Eolite/trunk/Eolite.c-- +++ b/programs/fs/Eolite/trunk/Eolite.c-- @@ -411,19 +411,6 @@ void KEdit() } -inline fastcall void TVScroll() { //Прокрутка - dword on_y; - IF (count<=0) {DrawFlatButton(onLeft(27,0),57,16,onTop(22,58),0,0xE4DFE1,""); return;} - on_y = za_kadrom * onTop(22,57) / count +57; - scroll_size=onTop(22,57) * but_num - but_num / count; - IF (scroll_size<20) scroll_size = 20; //устанавливаем минимальный размер скролла - IF (scroll_size>onTop(22,57)-on_y+56) || (za_kadrom+but_num>=count) on_y=onTop(23+scroll_size,0); //для большого списка - DrawFlatButton(onLeft(27,0),on_y,16,scroll_size,0,0xE4DFE1,"");//ползунок - DrawBar(onLeft(26,0),57,15,on_y-57,0xCED0D0);//поле до ползунка - DrawBar(onLeft(26,0),on_y+scroll_size+1,15,onTop(22,57)-scroll_size-on_y+56,0xCED0D0); //поле после ползунка -} - - void FileList_ReDraw(int curbtn_) { if (curbtn_<=0) //вверх @@ -699,7 +686,7 @@ void Paste() void Tip(int y, dword caption, id, arrow) { DrawBar(17,y,160,17,0xE4DFE1); //серое сверху - WriteText(25,y+5,0x80,0,caption,0); //text Goto: + WriteText(25,y+5,0x80,0,caption,0); IF (id<>0) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0xE4DFE1); //кнопа для стрелки WriteText(165,y+5,0x80,0,arrow,0); //стрелка вниз DrawBar(17,y+17,160,1,0x94AECE); //подчёркивание diff --git a/programs/fs/Eolite/trunk/include/about_dialog.h b/programs/fs/Eolite/trunk/include/about_dialog.h index 781d65238e..0e4d1171c9 100644 --- a/programs/fs/Eolite/trunk/include/about_dialog.h +++ b/programs/fs/Eolite/trunk/include/about_dialog.h @@ -37,7 +37,9 @@ void about_dialog() DefineAndDrawWindow(600,150,181,256,0x34,0x10EFEBEF,0,0,"About Eolite"); DrawBar(0,0,172,50,0x8494C4); //голубое сзади PutPaletteImage(#logo,85,85,43,7,#logo_pal); - WriteText(51,100,0x80,0xBF40BF,"Eolite v1.22",0); + WriteText(46,100,0x90,0xBF40BF,"Eolite v1.22",0); + $add ebx, 1<<16 + $int 0x40 WriteText(55,120,0x80,0,"Developers:",0); WriteText(39,130,0x80,0,"Leency & Veliant",0); WriteText(45,140,0x80,0,"KolibriOS Team",0); diff --git a/programs/fs/Eolite/trunk/include/icons_f.h b/programs/fs/Eolite/trunk/include/icons_f.h index 8afe0f1497..828eb06c9c 100644 --- a/programs/fs/Eolite/trunk/include/icons_f.h +++ b/programs/fs/Eolite/trunk/include/icons_f.h @@ -20,7 +20,7 @@ dword Put_icon(dword extension, yy) (!strcmp(extension,"ttf")) || (!strcmp(extension,"fon")) {fnum = 10; ftype="Font";} IF (!strcmp(extension,"asm")) {fnum = 11; ftype="Source";} IF (!strcmp(extension,"skn")) {fnum = 13; ftype="Skin";} - IF (!strcmp(extension,"djvu")) || (!strcmp(extension,"pdf")) {fnum = 15; ftype="Book";} + IF (!strcmp(extension,"djvu")) || (!strcmp(extension,"pdf")) || (!strcmp(extension,"fb2")) {fnum = 15; ftype="Book";} IF (!strcmp(extension,"nes")) {fnum = 18; ftype="Cartridge";} IF (!strcmp(extension,"img")) || (!strcmp(extension,"ima")) {fnum = 21; ftype="Image";} IF (!strcmp(extension,"dll")) || (!strcmp(extension,"obj")) {fnum = 22; ftype="Library";} diff --git a/programs/fs/Eolite/trunk/include/some_code.h b/programs/fs/Eolite/trunk/include/some_code.h index e5092d26a5..3fd51c6799 100644 --- a/programs/fs/Eolite/trunk/include/some_code.h +++ b/programs/fs/Eolite/trunk/include/some_code.h @@ -24,3 +24,15 @@ dword ConvertSize(dword bytes) copystr(#temp,#size_prefix+strlen(#size_prefix)); EAX=#size_prefix; } + +inline fastcall void TVScroll() { //Прокрутка + dword on_y; + IF (count<=0) {DrawFlatButton(onLeft(27,0),57,16,onTop(22,58),0,0xE4DFE1,""); return;} + on_y = za_kadrom * onTop(22,57) / count +57; + scroll_size=onTop(22,57) * but_num - but_num / count; + IF (scroll_size<20) scroll_size = 20; //устанавливаем минимальный размер скролла + IF (scroll_size>onTop(22,57)-on_y+56) || (za_kadrom+but_num>=count) on_y=onTop(23+scroll_size,0); //для большого списка + DrawFlatButton(onLeft(27,0),on_y,16,scroll_size,0,0xE4DFE1,"");//ползунок + DrawBar(onLeft(26,0),57,15,on_y-57,0xCED0D0);//поле до ползунка + DrawBar(onLeft(26,0),on_y+scroll_size+1,15,onTop(22,57)-scroll_size-on_y+56,0xCED0D0); //поле после ползунка +} \ No newline at end of file