WebSVN – Kolibri OS – Diff – /programs/cmm/iconedit/iconedit.c

 //                                                   //
 //                       DATA                        //
 //                                                   //
 //===================================================//
-#define T_TITLE "Icon Editor 0.33"
+#define T_TITLE "Icon Editor 0.35"
 #define TOOLBAR_H    24+8
 #define PANEL_LEFT_W 16+5+5+3+3
 #define PALLETE_SIZE 116
 #define TB_ICON_PADDING 26
+#define PAL_ITEMS_X_COUNT 13
+#define COLSIZE 18
+#define RIGHT_BAR_W PAL_ITEMS_X_COUNT*COLSIZE
+struct block {
+	int x,y,w,h;
+	bool hovered();
+};
+bool block::hovered() {
+	if ((mouse.x>x) && (mouse.y>y)
+	&& (mouse.y
+		return true;
+	return false;
-#define PAL_ITEMS_X_COUNT 13
+}
-#define COLSIZE 18
+block canvas = { NULL, NULL, NULL, NULL };
+block wrapper = { PANEL_LEFT_W, TOOLBAR_H, NULL, NULL };
+block right_bar = { NULL, TOOLBAR_H, RIGHT_BAR_W+10, NULL };
-rect wrapper = { PANEL_LEFT_W, TOOLBAR_H, NULL, NULL };
+block b_color_gradient = {NULL, 30+TOOLBAR_H, RIGHT_BAR_W, 30};
-rect right_bar = { NULL, TOOLBAR_H, PAL_ITEMS_X_COUNT*COLSIZE+10, NULL };
+block b_last_colors = {NULL, 70+TOOLBAR_H, RIGHT_BAR_W, COLSIZE*2};
 void FillTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
 	bool fill1=false;
-	bool fill2=false;
-	if (mouseX>canvas.x) && (mouseY>canvas.y)
+	bool fill2=false;
 		&& (mouseY
-		&& (mouseX
+	if (canvas.hovered())
+	{
 		if (currentTool==TOOL_FILL)
+		{
 void PipetteTool_activate() {
 	SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE);
+}
 void PipetteTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
-	active_color_1 = GetPixelColorFromScreen(mouseX + Form.left + 5, mouseY + Form.top + skin_height);
+	active_color_1 = GetPixelUnderMouse();
 	DrawActiveColor(NULL);
 	if (mouse.down) && (mouse.key&MOUSE_LEFT) {
 		setCurrentTool(TOOL_PENCIL);
+	}
+}
-void PencilTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
-	if (mouseX>canvas.x) && (mouseY>canvas.y)
-		&& (mouseY
+void PencilTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
-		&& (mouseX
+	if (canvas.hovered())
+	{
 		if (lkm)
 			image.set_pixel(mouseY-canvas.y/zoom.value,
 				mouseX-canvas.x/zoom.value, active_color_1);
 	LineTool_lastTempPosX = -1;
 	LineTool_lastTempPosY = -1;
+}
-void LineTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
-	if ((mouseX>canvas.x) && (mouseY>canvas.y)
-		&& (mouseY
+void LineTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
-		&& (mouseX
+	if (canvas.hovered())
+	{
 		if (mouse.down) && (mouse.key & MOUSE_LEFT) {
 			if ((LineTool_startX < 0) || (LineTool_startY < 0)) {
 				LineTool_startX = mouseX;
 				if (mouse.vert==65535) zoom.click(BTN_ZOOM_IN);
 				if (mouse.vert==1) zoom.click(BTN_ZOOM_OUT);
 				DrawEditArea();
+			}
+			if (mouse.down) {
+				if (b_color_gradient.hovered())
+				|| (b_last_colors.hovered())
+				|| (b_default_palette.hovered()) {
+					if (mouse.key&MOUSE_LEFT) EventSetActiveColor(1, GetPixelUnderMouse());
+					if (mouse.key&MOUSE_RIGHT) EventSetActiveColor(2, GetPixelUnderMouse());
+				}
+			}
 			break;
 		case evButton:
 					break;
 				case CLOSE_BTN:
 					ExitProcess();
 					break;
+			}
-			if (btn >= BTNS_PALETTE_COLOR_MAS) && (btn <= BTNS_PALETTE_COLOR_MAS+PALLETE_SIZE)
-			{
-				if (mouse.lkm) EventSetActiveColor(1, default_palette[btn - BTNS_PALETTE_COLOR_MAS]);
-				if (mouse.pkm) EventSetActiveColor(2, default_palette[btn - BTNS_PALETTE_COLOR_MAS]);
-			}
-			if (btn >= BTNS_LAST_USED_COLORS) && (btn < sizeof(last_used_colors)*sizeof(dword))
-			{
-				if (mouse.lkm) active_color_1 = last_used_colors[btn - BTNS_LAST_USED_COLORS];
-				if (mouse.pkm) active_color_2 = last_used_colors[btn - BTNS_LAST_USED_COLORS];
-				DrawActiveColor(NULL);
-			}
 			break;
 		case evKey:
 			GetKeys();
 	if (Form.status_window>2) return;
 	if (Form.width  < 560) { MoveSize(OLD,OLD,560,OLD); return; }
 	if (Form.height < 430) { MoveSize(OLD,OLD,OLD,430); return; }
+	right_bar.x = Form.cwidth - right_bar.w;
-	right_bar.x = Form.cwidth - right_bar.w;
+	b_color_gradient.x = b_last_colors.x = b_default_palette.x = right_bar.x;
 	tx.n = 10-TB_ICON_PADDING;
 	DrawToolbarButton(BTN_NEW,    tx.inc(TB_ICON_PADDING), 2); //not implemented
 	DrawLeftPanel();
 	DrawEditArea();
 	DrawActiveColor(right_bar.y);
-	DrawColorPallets(right_bar.x, right_bar.y + 70);
+	DrawColorPallets();
 	DrawBar(right_bar.x+110, outy, 20, 20, active_color_2);
 	sprintf(#param, "%A", active_color_2);
 	EDI = system.color.work;
 	WriteText(right_bar.x+110 + 30, outy + 3, 0xD0, system.color.work_text, #param+4);
-	DrawCurrentColorGradientByLightness(right_bar.x, outy+30);
+	DrawCurrentColorGradientByLightness();
 }
-void DrawCurrentColorGradientByLightness(int x, y)
+void DrawCurrentColorGradientByLightness()
+{
-	int i;
-	int w = right_bar.w-10/2;
+	int i;
+	int w = right_bar.w-10/2;
-	int h = 30;
+	for (i=0; i
-	for (i=0; i
+		DrawBar(b_color_gradient.x+i, b_color_gradient.y,
+, b_color_gradient.h, MixColors(active_color_1,0xFFFfff,255*i/w));
-		DrawBar(x+i, y, 1, h, MixColors(active_color_1,0xFFFfff,255*i/w));
+	for (i=0 ; i<=w; i++)
-	for (i=0 ; i<=w; i++)
+		DrawBar(b_color_gradient.x+w+w-i, b_color_gradient.y,
-		DrawBar(x+w+w-i, y, 1, h, MixColors(active_color_1,0x000000,255*i/w));
+, b_color_gradient.h, MixColors(active_color_1,0x000000,255*i/w));
+}
-void DrawColorPallets(dword _x, _y)
 void DrawColorPallets()
 	int r, c, i=0;
 	int r, c, i=0;
 	//Last used colors
 	for (r = 0; r < 2; r++)
 	{
 		for (c = 0; c < PAL_ITEMS_X_COUNT; c++, i++)
-		{
 			DrawBar(c*COLSIZE + _x, r*COLSIZE + _y, COLSIZE, COLSIZE, last_used_colors[i]);
-			DefineHiddenButton(c*COLSIZE + _x, r*COLSIZE + _y, COLSIZE-1, COLSIZE-1, BTNS_LAST_USED_COLORS+i);
+			DrawBar(c*COLSIZE + b_last_colors.x, r*COLSIZE + b_last_colors.y,
-		}
 				COLSIZE, COLSIZE, last_used_colors[i]);
 	_y += r*COLSIZE + 10;
 	i=0;
 	i=0;
 	//Default colors
 	for (r = 0; r < 9; r++)
 	{
 		for (c = 0; c < PAL_ITEMS_X_COUNT; c++, i++)
+		{
-			DrawBar(c*COLSIZE + _x, r*COLSIZE + _y, COLSIZE, COLSIZE, default_palette[PALLETE_SIZE-i]);
+			DrawBar(c*COLSIZE + b_default_palette.x, r*COLSIZE + b_default_palette.y,
-			DefineHiddenButton(c*COLSIZE + _x, r*COLSIZE + _y, COLSIZE-1, COLSIZE-1, BTNS_PALETTE_COLOR_MAS+PALLETE_SIZE-i);
+				COLSIZE, COLSIZE, default_palette[PALLETE_SIZE-i]);
-		}
+		}
+	}
+}
 void DrawCanvas()
+	}
 	if ((currentTool != TOOL_NONE) && (tools[currentTool].onCanvasDraw != 0))
+		tools[currentTool].onCanvasDraw();
+	DrawPreview();
+}
+void DrawPreview()
+{
+	int x = right_bar.x;
+	int y = wrapper.y + wrapper.h - image.rows-2;
-		tools[currentTool].onCanvasDraw();
+	DrawRectangle(x, y, image.columns+1, image.rows+1, system.color.work_graph);
+	_PutImage(x+1,y+1, image.columns, image.rows, image.get_image());
+}
+dword GetPixelUnderMouse()
+{
 	return GetPixelColorFromScreen(mouse.x + Form.left + 5, mouse.y + Form.top + skin_height);
+}
 	if (_number == 1) active_color_1 = _color;
 	if (_number == 2) active_color_2 = _color;
 	DrawActiveColor(NULL);
-	DrawColorPallets(right_bar.x, right_bar.y + 70);
+	DrawColorPallets();
+}
 // target - image (1) or canvas (2)
 void DrawLine(int x1, int y1, int x2, int y2, dword color, int target) {
 	int dx, dy, signX, signY, error, error2;
-	debugval("Draw line", x1);
+	// debugval("Draw line", x1);
-	debugval("Draw line", y1);
+	// debugval("Draw line", y1);
-	debugval("Draw line", x2);
+	// debugval("Draw line", x2);
-	debugval("Draw line", y2);
+	// debugval("Draw line", y2);
-	debugln("===");
+	// debugln("===");

Subversion Repositories Kolibri OS

(root)/programs/cmm/iconedit/iconedit.c – Rev 7194 → 7200