diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 1edb9328b6..e572190898 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -538,10 +538,10 @@ void draw_window() } else { - files.SetSizes(2, 57+18, Form.cwidth/2-2-17, Form.cheight-59-18, disc_num*16+3,files.line_h); + files.SetSizes(2, 57+22, Form.cwidth/2-2-17, Form.cheight-59-22, disc_num*16+3,files.line_h); DrawListColumns(); Open_Dir(#path,ONLY_SHOW); - files.SetSizes(Form.cwidth/2, 57+18, Form.cwidth/2-17, Form.cheight-59-18, disc_num*16+3,files.line_h); + files.SetSizes(Form.cwidth/2, 57+22, Form.cwidth/2 -17, Form.cheight-59-22, disc_num*16+3,files.line_h); DrawListColumns(); Open_Dir(#path,ONLY_SHOW); } diff --git a/programs/cmm/eolite/include/gui.h b/programs/cmm/eolite/include/gui.h index 85b51822ae..a3a8ceb1a4 100644 --- a/programs/cmm/eolite/include/gui.h +++ b/programs/cmm/eolite/include/gui.h @@ -5,9 +5,9 @@ dword col_palette[14] = {0xD2D3D3,0xD4D4D4,0xD6D5D6,0xD8D7D8,0xDAD8D9,0xDCDADB, void Scroll() { dword i; - word sc_x = Form.cwidth - 18; - word sc_y = 57; - word sc_h = Form.cheight - 18 - sc_y; + word sc_x = files.x + files.w; + word sc_y = files.y; + word sc_h = files.h - 16; word sc_slider_y; if (files.count<=0) @@ -34,11 +34,11 @@ void Scroll() { DrawBar(sc_x+2, sc_y+1, 14, sc_slider_y-sc_y-1, 0xCED0D0); } //area after slider - if (sc_h-sc_slider_h+55>sc_slider_y) + if (sc_h-sc_slider_h+sc_y-2>sc_slider_y) { DrawBar(sc_x+1, sc_slider_y + sc_slider_h+1, 15, 1, 0xC7C9C9); - DrawBar(sc_x+1, sc_slider_y + sc_slider_h+2, 1, sc_h-sc_slider_h-sc_slider_y+55, 0xC7C9C9); - DrawBar(sc_x+2, sc_slider_y + sc_slider_h+2, 14, sc_h-sc_slider_h-sc_slider_y+55, 0xCED0D0); + DrawBar(sc_x+1, sc_slider_y + sc_slider_h+2, 1, sc_h-sc_slider_h-sc_slider_y+sc_y-2, 0xC7C9C9); + DrawBar(sc_x+2, sc_slider_y + sc_slider_h+2, 14, sc_h-sc_slider_h-sc_slider_y+sc_y-2, 0xCED0D0); } } diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index 6b58dba668..c94924a482 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -112,7 +112,7 @@ void GetSystemDiscs() void DrawSystemDiscs() { char dev_name[15], disc_name[100], i, dev_icon, is_active; - int pos_y, pos_x; + int pos_y, pos_x=2; for (i=disc_num; i<30; i++) DeleteButton(100+i); for (i=0;i