Subversion Repositories Kolibri OS

Rev

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

Rev 7229 Rev 7243
Line 65... Line 65...
65 
	BTN_PENCIL,
 65 
	BTN_PENCIL,
66 
	BTN_PICK,
 66 
	BTN_PICK,
67 
	BTN_FILL,
 67 
	BTN_FILL,
68 
	BTN_LINE,
 68 
	BTN_LINE,
69 
	BTN_RECT,
 69 
	BTN_RECT,
70 
	BTN_ZOOM_IN,
 - 
 
71 
	BTN_ZOOM_OUT,
 - 
 
72 
	BTNS_PALETTE_COLOR_MAS = 100,
 70 
	BTNS_PALETTE_COLOR_MAS = 100,
73 
	BTNS_LAST_USED_COLORS = 400
 71 
	BTNS_LAST_USED_COLORS = 400
74 
};
 72 
};
Line 75... Line 73...
75 
 
 73 
 
Line 76... Line 74...
76 
proc_info Form;
 74 
proc_info Form;
Line 77... Line 75...
77 
 
 75 
 
78 
more_less_box zoom = { PANEL_LEFT_W, -100, 11, 1, 40, BTN_ZOOM_IN, BTN_ZOOM_OUT, "Zoom" };
 76 
more_less_box zoom = { 11, 1, 40, "Zoom" };
79 
 
 77 
 
80 
dword default_palette[] = {
 78 
dword default_palette[] = {
Line 376... Line 374...
376 
 
 374 
 
377 
			if (currentTool != TOOL_NONE)
 375 
			if (currentTool != TOOL_NONE)
Line 378... Line 376...
378 
				tools[currentTool].onMouseEvent(mouse.x, mouse.y, mouse.lkm, mouse.pkm);
 376 
				tools[currentTool].onMouseEvent(mouse.x, mouse.y, mouse.lkm, mouse.pkm);
379 
 
 377 
 
380 
			if (mouse.vert) {
 378 
			if (mouse.vert) {
381 
				if (mouse.vert==65535) zoom.click(BTN_ZOOM_IN);
 379 
				if (mouse.vert==65535) zoom.inc();
382 
				if (mouse.vert==1) zoom.click(BTN_ZOOM_OUT);
 380 
				if (mouse.vert==1) zoom.dec();
Line 383... Line 381...
383 
				DrawEditArea();
 381 
				DrawEditArea();
384 
			}
 382 
			}
Line 394... Line 392...
394 
 
 392 
 
Line 395... Line 393...
395 
			break;
 393 
			break;
396 
 
 394 
 
- 
 
 395 
		case evButton:
397 
		case evButton:
 396 
			btn = GetButtonID();
398 
			btn = GetButtonID();
 397 
			if (zoom.click(btn)) DrawEditArea();
399 
			switch(btn)
 398 
			switch(btn)
400 
			{
 399 
			{
401 
				case BTN_NEW:
 400 
				case BTN_NEW:
Line 447... Line 446...
447 
					setCurrentTool(TOOL_LINE);
 446 
					setCurrentTool(TOOL_LINE);
448 
					break;
 447 
					break;
449 
				case BTN_RECT:
 448 
				case BTN_RECT:
450 
					setCurrentTool(TOOL_RECT);
 449 
					setCurrentTool(TOOL_RECT);
451 
					break;
 450 
					break;
452 
				case BTN_ZOOM_IN:
 - 
 
453 
					zoom.click(BTN_ZOOM_IN);
 - 
 
454 
					DrawEditArea();
 - 
 
455 
					break;
 - 
 
456 
				case BTN_ZOOM_OUT:
 - 
 
457 
					zoom.click(BTN_ZOOM_OUT);
 - 
 
458 
					DrawEditArea();
 - 
 
459 
					break;
 - 
 
460 
				case CLOSE_BTN:
 451 
				case CLOSE_BTN:
461 
					ExitProcess();
 452 
					ExitProcess();
462 
					break;
 453 
					break;
463 
			}
 454 
			}
464 
			break;
 455 
			break;
Line 473... Line 464...
473 
			if (key_scancode == SCAN_CODE_KEY_R) setCurrentTool(TOOL_RECT);
 464 
			if (key_scancode == SCAN_CODE_KEY_R) setCurrentTool(TOOL_RECT);
Line 474... Line 465...
474 
 
 465 
 
475 
			if (key_scancode == SCAN_CODE_KEY_S) actionsHistory.undoLastAction();
 466 
			if (key_scancode == SCAN_CODE_KEY_S) actionsHistory.undoLastAction();
Line 476... Line 467...
476 
			if (key_scancode == SCAN_CODE_KEY_C) actionsHistory.redoLastAction();
 467 
			if (key_scancode == SCAN_CODE_KEY_C) actionsHistory.redoLastAction();
477 
 
 468 
 
478 
			if (key_scancode == SCAN_CODE_MINUS) {zoom.click(BTN_ZOOM_OUT); DrawEditArea();}
 469 
			if (key_scancode == SCAN_CODE_MINUS) {zoom.inc(); DrawEditArea();}
Line 479... Line 470...
479 
			if (key_scancode == SCAN_CODE_PLUS)  {zoom.click(BTN_ZOOM_IN);  DrawEditArea();}
 470 
			if (key_scancode == SCAN_CODE_PLUS)  {zoom.dec();  DrawEditArea();}
480 
			break;
 471 
			break;
481
472
Line 500... Line 491...
500 
	img_draw stdcall(skin.image, x+3, _y+3, 16, 16, 0, _icon_n*16);
 491 
	img_draw stdcall(skin.image, x+3, _y+3, 16, 16, 0, _icon_n*16);
501 
}
 492 
}
Line 502... Line 493...
502 
 
 493 
 
503 
void DrawStatusBar()
 494 
void DrawStatusBar()
504 
{
 495 
{
505 
	zoom.y = wrapper.y + wrapper.h + 6;
 - 
 
506 
	zoom.x = wrapper.x;
 - 
 
Line 507... Line 496...
507 
	zoom.draw();
 496 
	zoom.draw(wrapper.x, wrapper.y + wrapper.h + 6);
508 
 
 497 
 
509 
	sprintf(#param,"Canvas: %ix%i", image.rows, image.columns);
 498 
	sprintf(#param,"Canvas: %ix%i", image.rows, image.columns);
Line 570... Line 559...
570 
 
 559 
 
571 
	//canvas{
 560 
	//canvas{
572 
	canvas.w = image.columns * zoom.value;
 561 
	canvas.w = image.columns * zoom.value;
573 
	canvas.h = image.rows * zoom.value;
 562 
	canvas.h = image.rows * zoom.value;
574 
	if (canvas.w+2 > wrapper.w) || (canvas.h+2 > wrapper.h) {
563 
	if (canvas.w+2 > wrapper.w) || (canvas.h+2 > wrapper.h) {
575 
		zoom.click(BTN_ZOOM_OUT);
 564 
		zoom.dec();
576 
		DrawEditArea();
 565 
		DrawEditArea();
577 
		return;
 566 
		return;
578 
	}
 567 
	}
579 
	canvas.x = -zoom.value*image.columns+wrapper.w/2 + wrapper.x;
 568 
	canvas.x = -zoom.value*image.columns+wrapper.w/2 + wrapper.x;