From 8ecfc9d15aa394bacd626b91647e16b66d81e4a5 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 31 Jul 2012 15:05:39 +0000 Subject: [PATCH] Eolite 1.32: scroll bug fixed git-svn-id: svn://kolibrios.org@2896 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/fs/Eolite/trunk/Eolite.c-- | 10 ++++++---- programs/fs/Eolite/trunk/include/about_dialog.h | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c-- index 338e7d7841..6964657fea 100644 --- a/programs/fs/Eolite/trunk/Eolite.c-- +++ b/programs/fs/Eolite/trunk/Eolite.c-- @@ -20,7 +20,7 @@ int BUTTON_HEIGHT=18; #define ONLY_OPEN 2 //переменные -#define title "Eolite File Manager v1.31" +#define title "Eolite File Manager v1.32" dword selection_col=0x94AECE; @@ -83,7 +83,7 @@ dword buf, off; // void main() word key, id; mouse m; -int pressed_y; +int pressed_y, scroll_used=0; { load_editbox_lib(); GetSystemDiscs(); @@ -159,7 +159,10 @@ int pressed_y; List_ReDraw(); } //скролл - if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>56) && && (m.y<65000) while (m.lkm) + if (!m.lkm) scroll_used=0; + if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>56) && (m.ym.y) || (m.y<0) || (m.y>4000) m.y=scroll_size/2+57; //если курсор над окном id=za_kadrom; //сохраняем старое количество @@ -168,7 +171,6 @@ int pressed_y; za_kadrom /= onTop(22,57); IF (but_num+za_kadrom>count) za_kadrom=count-but_num; IF (id<>za_kadrom) List_ReDraw(); //чтоб лишний раз не перерисовывать - m.get(); } break; //Button pressed----------------------------------------------------------------------------- diff --git a/programs/fs/Eolite/trunk/include/about_dialog.h b/programs/fs/Eolite/trunk/include/about_dialog.h index ae16121ba5..8dc1d82181 100644 --- a/programs/fs/Eolite/trunk/include/about_dialog.h +++ b/programs/fs/Eolite/trunk/include/about_dialog.h @@ -39,7 +39,7 @@ void about_dialog() DefineAndDrawWindow(600,150,181,256,0x34,0x10EFEBEF,"About Eolite"); DrawBar(0,0,172,50,0x8494C4); //голубое сзади PutPaletteImage(#logo,85,85,43,7,#logo_pal); - WriteText(46,100,0x90,0xBF40BF,"Eolite v1.31",0); + WriteText(46,100,0x90,0xBF40BF,"Eolite v1.32",0); $add ebx, 1<<16 $int 0x40 WriteText(55,120,0x80,0,"Developers:",0);