Subversion Repositories Kolibri OS

Rev

Rev 7804 | Rev 7819 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7804 Rev 7806
Line 106... Line 106...
106 
				break;
 106 
				break;
107
107
Line 108... Line 108...
108 
			case evReDraw:
 108 
			case evReDraw:
109 
				DefineAndDrawWindow(Form.cwidth-300/2+Form.left, Form.cheight-292/2+Form.top, 400,
109 
				DefineAndDrawWindow(Form.cwidth-300/2+Form.left, Form.cheight-292/2+Form.top, 400,
110 
					435+skin_height,0x34,system.color.work,TITLE_SETT,0);
 110 
					435+skin_height,0x34,sc.work,TITLE_SETT,0);
111 
				GetProcessInfo(#Settings, SelfInfo);
 111 
				GetProcessInfo(#Settings, SelfInfo);
112 
				DrawSettingsCheckBoxes();
 112 
				DrawSettingsCheckBoxes();
113 
		}
 113 
		}
114 
	}
 114 
	}
115 
}
 115 
}
Line 223... Line 223...
223 
 
 223 
 
Line 224... Line 224...
224 
void SetAppColors()
 224 
void SetAppColors()
225 
{
 225 
{
226 
	int i;
 226 
	int i;
- 
 
 227 
	static dword bg_col;
227 
	dword bg_col, old_list_bg_color;
 228 
	dword old_list_bg_color = col.list_bg;
228 
	system.color.get();
 229 
	sc.get();
229 
	if (col.work == system.color.work) return;
 230 
	if (bg_col == sc.work) return;
230 
	old_list_bg_color = col.list_bg;
 - 
 
231 
	bg_col = system.color.work;
 231 
	bg_col = sc.work;
232 
	if (skin_is_dark())
232 
	if (skin_is_dark())
233 
	{
 233 
	{
234 
		//use dark colors
 234 
		//use dark colors
235 
		col.def = false;
 235 
		col.def = false;
236 
		col.list_bg = system.color.work;
 236 
		col.list_bg = sc.work;
237 
		col.list_gb_text = system.color.work_text;
 237 
		col.list_gb_text = sc.work_text;
238 
		col.list_text_hidden = 0xA6A6B7;
 238 
		col.list_text_hidden = 0xA6A6B7;
239 
		col.list_vert_line = system.color.work_graph;
 239 
		col.list_vert_line = sc.work_graph;
240 
		col.work = system.color.work;
 - 
 
241 
		col.graph = system.color.work_graph;
 - 
 
242 
		col.lpanel  = MixColors(system.color.work_graph, system.color.work, 65);
 240 
		col.lpanel  = MixColors(sc.work_graph, sc.work, 65);
243 
		col.selec = col.selec_active = system.color.work_button;
 241 
		col.selec = col.selec_active = sc.button;
244 
		col.selec_text = system.color.work_button_text;
 242 
		col.selec_text = sc.button_text;
245 
		system.color.work_dark = MixColors(0, system.color.work, 35);
 243 
		sc.work_dark = MixColors(0, sc.work, 35);
246 
		if (col.list_bg==col.selec) col.selec = system.color.work_graph; //for fucking skins
 244 
		if (col.list_bg==col.selec) col.selec = sc.work_graph; //for fucking skins
247 
		col.slider_bg_big = MixColors(0xCED0D0, system.color.work, 35);
 245 
		col.slider_bg_big = MixColors(0xCED0D0, sc.work, 35);
248 
		col.odd_line = MixColors(0xFFFfff, system.color.work, 15);
 246 
		col.odd_line = MixColors(0xFFFfff, sc.work, 15);
249 
	}
 247 
	}
250 
	else
248 
	else
251 
	{
 249 
	{
252 
		//use light colors
 250 
		//use light colors
253 
		col.def = true;
 251 
		col.def = true;
254 
		col.list_bg = 0xFFFfff;
 252 
		col.list_bg = 0xFFFfff;
255 
		col.list_gb_text = 0x000000;
 253 
		col.list_gb_text = 0x000000;
256 
		col.list_text_hidden = 0xA6A6B7;
 254 
		col.list_text_hidden = 0xA6A6B7;
257 
		col.list_vert_line = 0xDDD7CF;
 255 
		col.list_vert_line = 0xDDD7CF;
258 
		col.work = system.color.work;
 - 
 
259 
		col.graph = system.color.work_graph;
 - 
 
260 
		col.lpanel  = 0x00699C;
 256 
		col.lpanel  = 0x00699C;
261 
		col.selec = col.selec_active = 0x94AECE;
 257 
		col.selec = col.selec_active = 0x94AECE;
262 
		col.selec_text = 0x000000;
 258 
		col.selec_text = 0x000000;
263 
		system.color.work_dark = MixColors(0, system.color.work, 35);
 259 
		sc.work_dark = MixColors(0, sc.work, 35);
264 
		col.slider_bg_big = 0xCDCFCF;
 260 
		col.slider_bg_big = 0xCDCFCF;
265 
		col.odd_line = 0xF1F1F1;
 261 
		col.odd_line = 0xF1F1F1;
266 
	}
 262 
	}
267 
	col.selec_inactive = MixColors(0xBBBbbb, col.list_bg, 65);
 263 
	col.selec_inactive = MixColors(0xBBBbbb, col.list_bg, 65);
268 
	col.slider_bg_left = MixColors(col.graph, col.slider_bg_big, 10);
 264 
	col.slider_bg_left = MixColors(sc.work_graph, col.slider_bg_big, 10);
269 
	for (i=0; i<20; i++) col.work_gradient[i] = MixColors(system.color.work_light, system.color.work, i*5);
 265 
	for (i=0; i<20; i++) col.work_gradient[i] = MixColors(sc.work_light, sc.work, i*5);
270 
	if (old_list_bg_color!=col.list_bg) LoadIcons();
 266 
	if (old_list_bg_color!=col.list_bg) LoadIcons();
271 
}
 267 
}
Line 272... Line 268...
272 
 
 268