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

Eolite 3.0 beta 5: more GUI flexibility

Browse Source 
git-svn-id: svn://kolibrios.org@5703 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-08-09 22:26:14 +00:00
parent bfaa4505b4
commit 6fc5704c83
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -538,10 +538,10 @@ void draw_window()
} }
else 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(); DrawListColumns();
Open_Dir(#path,ONLY_SHOW); 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(); DrawListColumns();
Open_Dir(#path,ONLY_SHOW); Open_Dir(#path,ONLY_SHOW);
} }

12
programs/cmm/eolite/include/gui.h
View File

@ -5,9 +5,9 @@ dword col_palette[14] = {0xD2D3D3,0xD4D4D4,0xD6D5D6,0xD8D7D8,0xDAD8D9,0xDCDADB,
void Scroll() { void Scroll() {
dword i; dword i;
word sc_x = Form.cwidth - 18; word sc_x = files.x + files.w;
word sc_y = 57; word sc_y = files.y;
word sc_h = Form.cheight - 18 - sc_y; word sc_h = files.h - 16;
word sc_slider_y; word sc_slider_y;
if (files.count<=0) 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); DrawBar(sc_x+2, sc_y+1, 14, sc_slider_y-sc_y-1, 0xCED0D0);
} }
//area after slider //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+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+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+55, 0xCED0D0); DrawBar(sc_x+2, sc_slider_y + sc_slider_h+2, 14, sc_h-sc_slider_h-sc_slider_y+sc_y-2, 0xCED0D0);
} }
} }

15
programs/cmm/eolite/include/left_panel.h
View File

@ -112,7 +112,7 @@ void GetSystemDiscs()
void DrawSystemDiscs() void DrawSystemDiscs()
{ {
char dev_name[15], disc_name[100], i, dev_icon, is_active; 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=disc_num; i<30; i++) DeleteButton(100+i);
for (i=0;i<disc_num;i++) for (i=0;i<disc_num;i++)
@ -180,15 +180,20 @@ void DrawSystemDiscs()
} }
else else
{ {
pos_y = 41; pos_y = 43;
pos_x = i*80 + files.x;
DrawBar(pos_x, pos_y, 80, 17, 0xFFFFFF); DrawBar(pos_x, pos_y, 80, 17, 0xFFFFFF);
DefineButton(pos_x, pos_y, 79, 16, 100+i+BT_HIDE,0xFFFFFF); DefineButton(pos_x+2, pos_y, strlen(#dev_name)*6 + 33, 16, 100+i+BT_HIDE,0xFFFFFF);
_PutImage(pos_x + 5, pos_y, 18,17, is_active*6+dev_icon*17*18*3+#devices); _PutImage(pos_x + 5, pos_y, 18,17, is_active*6+dev_icon*17*18*3+#devices);
WriteText(pos_x + 24, pos_y+5, 0x80, 0, #dev_name); WriteText(pos_x + 24, pos_y+5, 0x80, 0, #dev_name);
pos_x += strlen(#dev_name)*6 + 37;
} }
} }
if (two_panels) DrawBar(pos_x + 80, pos_y, files.x + files.w - pos_x - 80 + 17, 17, system.color.work); if (two_panels)
{
DrawBar(pos_x, pos_y, Form.cwidth - pos_x - 2, 17, 0xFFFFFF);
DrawBar(2, pos_y-2, Form.cwidth - 4, 2, 0xFFFFFF);
DrawBar(2, pos_y+17, Form.cwidth - 4, 2, 0xFFFFFF);
}
} }

4
programs/cmm/eolite/include/translations.h
View File

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager v3.0 beta 4" #define TITLE "Eolite File Manager v3.0 beta 5"
#define ABOUT_TITLE "Eolite 3.0 beta 4" #define ABOUT_TITLE "Eolite 3.0 beta 5"
#ifdef LANG_RUS #ifdef LANG_RUS
?define T_FILE "” ©«" ?define T_FILE "” ©«"