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

 //                                                   //
 //                       DATA                        //
 //                                                   //
 //===================================================//
-#define T_TITLE "Icon Editor 0.38"
+#define T_TITLE "Icon Editor 0.39"
 #define TOOLBAR_H    24+8
 #define PANEL_LEFT_W 16+5+5+3+3
 block b_color_gradient = {NULL, 30+TOOLBAR_H, RIGHT_BAR_W, 30};
 block b_last_colors = {NULL, 70+TOOLBAR_H, RIGHT_BAR_W, COLSIZE*2};
 block b_default_palette = {NULL, COLSIZE*2+10+70+TOOLBAR_H, RIGHT_BAR_W, COLSIZE*9};
+dword color1 = 0x000000;
-dword active_color_1 = 0x000000;
+dword color2 = 0xFFFfff;
-dword active_color_2 = 0xFFFfff;
+dword tool_color;
 enum {
 //                       CODE                        //
 //                                                   //
 //===================================================//
-void FillTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
-	bool fill1=false;
-	bool fill2=false;
-	if (canvas.hovered())
-	{
+void FillTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
-		if (currentTool==TOOL_FILL)
-		{
-			if (mouse.key&MOUSE_LEFT)&&(mouse.up) fill1=true;
-			if (mouse.key&MOUSE_RIGHT)&&(mouse.up) fill2=true;
-		}
-		else
+	if (canvas.hovered()) && (currentTool==TOOL_FILL) && (mouse.up)
-		{
-			if (lkm) fill1=true;
-			if (pkm) fill2=true;
-		}
 		if (fill1)
-			EventFill(mouseY-canvas.y/zoom.value,
-					mouseX-canvas.x/zoom.value, active_color_1);
-		if (fill2)
-			EventFill(mouseY-canvas.y/zoom.value,
+		EventFill(mouseY-canvas.y/zoom.value,
-					mouseX-canvas.x/zoom.value, active_color_2);
-		if ((fill1) || (fill2))
+				mouseX-canvas.x/zoom.value, tool_color);
-			actionsHistory.saveCurrentState();
 		actionsHistory.saveCurrentState();
 		DrawCanvas();
+	}
+}
 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 = GetPixelUnderMouse();
+	tool_color = GetPixelUnderMouse();
-	DrawActiveColor(NULL);
+	DrawBar(Form.cwidth-30, 5, 20, 20, tool_color);
 	if (mouse.down) {
-	if (mouse.down) && (mouse.key&MOUSE_LEFT) {
+		SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
-		SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
+		if (mouse.key&MOUSE_LEFT) EventSetActiveColor(1, tool_color);
-		EventSetActiveColor(1, active_color_1);
+		if (mouse.key&MOUSE_RIGHT) EventSetActiveColor(2, tool_color);
 		setCurrentTool(TOOL_PENCIL);
+	}
 }
 bool PencilTool_Drawing = false;
-void PencilTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
-	if (canvas.hovered())
-	{
-		if ((PencilTool_Drawing == true) && (!lkm) && (!pkm)) {
+void PencilTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
-			actionsHistory.saveCurrentState();
+	if (canvas.hovered())
-			PencilTool_Drawing = false;
+	{
-		}
-		if (lkm)
+		if ((PencilTool_Drawing == true) && (!mouse.key)) {
-			image.set_pixel(mouseY-canvas.y/zoom.value,
+			actionsHistory.saveCurrentState();
-				mouseX-canvas.x/zoom.value, active_color_1);
+			PencilTool_Drawing = false;
 		if (pkm)
 			image.set_pixel(mouseY-canvas.y/zoom.value,
-				mouseX-canvas.x/zoom.value, active_color_2);
+		if (mouse.key) {
 		if (mouseX>canvas.x+canvas.w-zoom.value) mouseX = canvas.x+canvas.w-zoom.value;
 		if (mouseY>canvas.y+canvas.h-zoom.value) mouseY = canvas.y+canvas.h-zoom.value;
 		if (mouseX
 		if (mouseY
-		if (mouse.lkm) {
+		if (mouse.key) {
 			if ((figTool_States[currentFigToolState].startX < 0) || (figTool_States[currentFigToolState].startY < 0)) {
 				figTool_States[currentFigToolState].startX = mouseX;
 				figTool_States[currentFigToolState].startY = mouseY;
+			}
 				if (currentTool == TOOL_LINE) {
 					DrawLine(figTool_States[currentFigToolState].startX - canvas.x/zoom.value,
 						figTool_States[currentFigToolState].startY - canvas.y/zoom.value,
 						mouseX - canvas.x/zoom.value,
 						mouseY - canvas.y/zoom.value,
-						active_color_1,
+						tool_color,
 );
+				}
 				else if (currentTool == TOOL_RECT) {
 					DrawRectangleInCanvas(figTool_States[currentFigToolState].startX - canvas.x/zoom.value,
 						figTool_States[currentFigToolState].startY - canvas.y/zoom.value,
 						mouseX - canvas.x/zoom.value,
-						mouseY - canvas.y/zoom.value, active_color_1, 1);
+						mouseY - canvas.y/zoom.value, tool_color, 1);
+				}
 				DrawCanvas();
+		}
+	}
+}
 void SimpleFigureTool_onCanvasDraw() {
-	if ((figTool_States[currentFigToolState].startX >= 0) && (figTool_States[currentFigToolState].startY >= 0) && (mouse.lkm)) {
+	if ((figTool_States[currentFigToolState].startX >= 0) && (figTool_States[currentFigToolState].startY >= 0) && (mouse.key)) {
 		if (currentTool == TOOL_LINE) {
 			DrawLine(figTool_States[currentFigToolState].startX - canvas.x/zoom.value,
 				figTool_States[currentFigToolState].startY - canvas.y/zoom.value,
 				mouseX_last - canvas.x/zoom.value,
 				mouseY_last - canvas.y/zoom.value,
-				active_color_1,
+				tool_color,
 );
+		}
 		else if (currentTool == TOOL_RECT) {
 			DrawRectangleInCanvas(figTool_States[currentFigToolState].startX - canvas.x/zoom.value,
 				figTool_States[currentFigToolState].startY - canvas.y/zoom.value,
 				mouseX_last - canvas.x/zoom.value,
 				mouseY_last - canvas.y/zoom.value,
-				active_color_1,
+				tool_color,
 );
+		}
 	loop() switch(WaitEvent())
+	{
 		case evMouse:
 			mouse.get();
+			if (mouse.lkm) tool_color = color1;
+			if (mouse.pkm) tool_color = color2;
+			if (mouse.mkm) break;
 			if (currentTool != TOOL_NONE)
 				tools[currentTool].onMouseEvent(mouse.x, mouse.y, mouse.lkm, mouse.pkm);
 void DrawActiveColor(dword iny)
+{
 	static dword outy;
 	if (iny != NULL) outy = iny;
-	DrawBar(right_bar.x, outy, 20, 20, active_color_1);
+	DrawBar(right_bar.x, outy, 20, 20, color1);
-	sprintf(#param, "%A", active_color_1);
+	sprintf(#param, "%A", color1);
 	EDI = system.color.work;
 	WriteText(right_bar.x + 30, outy + 3, 0xD0, system.color.work_text, #param+4);
-	DrawBar(right_bar.x+110, outy, 20, 20, active_color_2);
+	DrawBar(right_bar.x+110, outy, 20, 20, color2);
-	sprintf(#param, "%A", active_color_2);
+	sprintf(#param, "%A", color2);
 	EDI = system.color.work;
 	WriteText(right_bar.x+110 + 30, outy + 3, 0xD0, system.color.work_text, #param+4);
+{
 	int i;
 	int w = right_bar.w-10/2;
 	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));
+, b_color_gradient.h, MixColors(color1,0xFFFfff,255*i/w));
 	for (i=0 ; i<=w; i++)
 		DrawBar(b_color_gradient.x+w+w-i, b_color_gradient.y,
-, b_color_gradient.h, MixColors(active_color_1,0x000000,255*i/w));
+, b_color_gradient.h, MixColors(color1,0x000000,255*i/w));
+}
 void DrawColorPallets()
+{
 	for (i=13*2-1; i>0; i--) {
 		last_used_colors[i] = last_used_colors[i-1];
+	}
 	last_used_colors[0] = _color;
-	if (_number == 1) active_color_1 = _color;
+	if (_number == 1) color1 = _color;
-	if (_number == 2) active_color_2 = _color;
+	if (_number == 2) color2 = _color;
 	DrawActiveColor(NULL);

Subversion Repositories Kolibri OS

(root)/programs/cmm/iconedit/iconedit.c – Rev 7206 → 7207