Eolite: better left panel for dark skins

git-svn-id: svn://kolibrios.org@8240 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2020-11-23 13:31:55 +00:00
parent c4c194bcf6
commit f772c6b60a
3 changed files with 16 additions and 18 deletions

View File

@ -3,8 +3,8 @@
// 70.5 - get volume info and label // 70.5 - get volume info and label
#define TITLE "Eolite File Manager 4.46d" #define TITLE "Eolite File Manager 4.47"
#define ABOUT_TITLE "EOLITE 4.46d" #define ABOUT_TITLE "EOLITE 4.47"
#ifndef AUTOBUILD #ifndef AUTOBUILD
#include "lang.h--" #include "lang.h--"
@ -72,6 +72,7 @@ struct Eolite_colors
dword slider_bg_left; dword slider_bg_left;
dword odd_line; dword odd_line;
} col; } col;
dword waves_pal[256];
int toolbar_buttons_x[7]={9,46,85,134,167,203}; int toolbar_buttons_x[7]={9,46,85,134,167,203};

View File

@ -229,7 +229,7 @@ void ActionsDraw()
{ {
int i; int i;
int actions_y= SystemDiscs.list.count*DEV_H+108; int actions_y= SystemDiscs.list.count*DEV_H+108;
Tip(actions_y-18, T_ACTIONS, 77, ""); //çàãîëîâîê Tip(actions_y-18, T_ACTIONS, 77, "");
for (i=0; actions[i*3]!=0; i++, actions_y+=DEV_H) for (i=0; actions[i*3]!=0; i++, actions_y+=DEV_H)
{ {
DrawBar(17,actions_y,160,DEV_H,0xFFFFFF); //áåëîå DrawBar(17,actions_y,160,DEV_H,0xFFFFFF); //áåëîå
@ -245,24 +245,19 @@ void DrawLeftPanelBg()
int actions_y = SystemDiscs.list.count*DEV_H; int actions_y = SystemDiscs.list.count*DEV_H;
int start_y = actions_y+159; int start_y = actions_y+159;
int area_h; int area_h;
DrawBar(2,41,190,15,col.lpanel); //ñèíèé ïðÿìîóãîëüíèê - íàä äåâàéñàìè int i;
DrawBar(17,actions_y+75,160,15,col.lpanel); //ñèíèé ïðÿìîóãîëüíèê - ïîä äåâàéñàìè DrawBar(2,41,190,15,waves_pal[0]); //above devices block
DrawBar(17,actions_y+75,160,15,waves_pal[0]); //below devices block
PutShadow(17,actions_y+75,160,1,1,3); PutShadow(17,actions_y+75,160,1,1,3);
PutShadow(18,actions_y+75+1,158,1,1,1); PutShadow(18,actions_y+75+1,158,1,1,1);
DrawBar(2,56,15,actions_y+103,col.lpanel); //ñèíèé ïðÿìîóãîëüíèê - ñëåâà DrawBar(2,56,15,actions_y+103,waves_pal[0]); //on the left
DrawBar(177,56,15,actions_y+103,col.lpanel); //ñèíèé ïðÿìîóãîëüíèê - ñïðàâà DrawBar(177,56,15,actions_y+103,waves_pal[0]); //on the right
area_h = Form.cheight-start_y-2 - status_bar_h; area_h = Form.cheight-start_y-2 - status_bar_h;
if (col.def)
{
if (area_h < 268){ if (area_h < 268){
PutPaletteImage(#blue_hl, 190, area_h, 2, start_y, 8, #blue_hl_pal); PutPaletteImage(#blue_hl, 190, area_h, 2, start_y, 8, #waves_pal);
} else { } else {
DrawBar(2,start_y,190, area_h-268, col.lpanel); DrawBar(2,start_y,190, area_h-268, waves_pal[0]);
PutPaletteImage(#blue_hl, 190, 268, 2, Form.cheight-270-status_bar_h, 8, #blue_hl_pal); PutPaletteImage(#blue_hl, 190, 268, 2, Form.cheight-270-status_bar_h, 8, #waves_pal);
}
}
else {
DrawBar(2,start_y,190, area_h, col.lpanel);
} }
PutShadow(17,start_y,160,1,1,3); PutShadow(17,start_y,160,1,1,3);
PutShadow(18,start_y+1,158,1,1,1); PutShadow(18,start_y+1,158,1,1,1);

View File

@ -248,6 +248,7 @@ void SetAppColors()
if (col.list_bg==col.selec) col.selec = sc.work_graph; //for fucking skins if (col.list_bg==col.selec) col.selec = sc.work_graph; //for fucking skins
col.slider_bg_big = MixColors(0xCED0D0, sc.work, 35); col.slider_bg_big = MixColors(0xCED0D0, sc.work, 35);
col.odd_line = MixColors(0xFFFfff, sc.work, 15); col.odd_line = MixColors(0xFFFfff, sc.work, 15);
for (i=0; blue_hl_pal[i]!=0; i++) waves_pal[i] = MixColors(col.lpanel, blue_hl_pal[i], 180);
} }
else else
{ {
@ -262,6 +263,7 @@ void SetAppColors()
col.selec_text = 0x000000; col.selec_text = 0x000000;
col.slider_bg_big = 0xCDCFCF; col.slider_bg_big = 0xCDCFCF;
col.odd_line = 0xF1F1F1; col.odd_line = 0xF1F1F1;
for (i=0; blue_hl_pal[i]!=0; i++) waves_pal[i] = blue_hl_pal[i];
} }
col.selec_inactive = MixColors(0xBBBbbb, col.list_bg, 65); col.selec_inactive = MixColors(0xBBBbbb, col.list_bg, 65);
col.slider_bg_left = MixColors(sc.work_graph, col.slider_bg_big, 10); col.slider_bg_left = MixColors(sc.work_graph, col.slider_bg_big, 10);