WebSVN – Kolibri OS – Diff – /programs/cmm/iconedit/tools/selection.h

 	if (selection_end_y < selection_start_y) {
 		selection_end_y >< selection_start_y;
+	}
+}
+void SelectTool_drawBufferToImage(int insert_x, int insert_y) {
+	dword r, c;
+	dword insert_to_x, insert_to_y;
+		insert_to_x = math.min(insert_x + selection.columns - 1, image.columns-1);
+		insert_to_y = math.min(insert_y + selection.rows - 1, image.rows-1);
+		for (r = insert_y; r <= insert_to_y; r++) {
+			for (c = insert_x; c <= insert_to_x; c++) {
+					image.set_pixel(r, c, selection.get_pixel(r - insert_y, c - insert_x) );
+			}
+		}
+}
-void reset_selection_moving() {
+void ApplySelectionToImage() {
+	if (STATE_SELECTED != selection_state) return;
-	if (STATE_SELECTED == selection_state) {
-		SelectTool_drawBuffer(selection_start_x, selection_start_y, 1);
+	SelectTool_drawBufferToImage(selection_start_x, selection_start_y);
-		selection_pivot_x = -1;
-		selection_pivot_y = -1;
 	selection_pivot_x = -1;
-		selection_state = STATE_SELECTED;
+	selection_pivot_y = -1;
-		actionsHistory.saveCurrentState();
-		DrawCanvas();
+	actionsHistory.saveCurrentState();
 	DrawCanvas();
+}
 bool is_selection_moving() {
 	if (STATE_SELECTED == selection_state) return true;
 	return false;
+}
 void reset_selection() {
 	reset_selection();
 	selection_state = STATE_INACTIVE;
+}
 void SelectTool_deactivate() {
-	reset_selection_moving();
+	ApplySelectionToImage();
 	selection_state = STATE_INACTIVE;
+}
 			if (selection_pivot_x == -1) {
 				selection_pivot_x = m_x;
 				selection_pivot_y = m_y;
-				GetKeys();
+				GetKeys();
-				if ( !(key_modifier&KEY_LSHIFT) ) {
+				if ( (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) ) {
+					DrawBarIcon(selection_start_x, selection_start_y, selection_end_x,
-					DrawBarIcon(selection_start_x, selection_start_y, selection_end_x, selection_end_y, color2, TOIMAGE);
+						selection_end_y, color2, TOIMAGE);
+				}
 				selection_state = STATE_SELECTED;
 			dy = selection_start_y;
 		if (selection_end_y + dy >= image.rows)
-			dy = image.rows-1 - selection_end_y;
 			dy = image.rows-1 - selection_end_y;
 		selection_start_x += dx;
 		selection_end_x += dx;
 		DrawCanvas();
+	}
 	if (STATE_CHOSING == selection_state)
 	{
-		if (mouseX>canvas.x+canvas.w-zoom.value) mouseX = canvas.x+canvas.w-zoom.value;
+		mouseX = math.in(mouseX, canvas.x, 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
+		mouseY = math.in(mouseY, canvas.y, canvas.y+canvas.h-zoom.value);
 		if (mouse.key) {
 				selection_start_x = TO_CANVAS_X(mouseX);
 				selection_start_y = TO_CANVAS_Y(mouseY);
+			}
 			else {
 				DrawCanvas();
-				/**if ((calc(TO_CANVAS_X(mouseX)) != selection_end_x)
-					|| (calc(TO_CANVAS_Y(mouseY)) != selection_end_y))
-				{
-					DrawCanvas();
-				}*/
+			}
+		}
 			selection_pivot_y = -1;
+		}
+	}
+}
-void SelectTool_onCanvasDraw() {
-	if ((selection_start_x >= 0) && (selection_start_y >= 0) && (selection_end_x >= 0) && (selection_end_y >= 0)) {
-		DrawSelection();
-	}
-}
-void SelectTool_drawBuffer(int insert_x, int insert_y, int target) {
-	dword color;
+void SelectTool_onKeyEvent(dword keycode) {
-	dword r, c;
-	dword insert_to_x, insert_to_y;
-	if (STATE_INACTIVE != selection_state) {
-		insert_to_x = insert_x + selection.columns - 1;
-		if (insert_to_x >= image.columns)
-			insert_to_x = image.columns-1;
-		insert_to_y = insert_y + selection.rows - 1;
-		if (insert_to_y >= image.rows)
-			insert_to_y = image.rows-1;
-		for (r = insert_y; r <= insert_to_y; r++) {
+	dword r, c;
-			for (c = insert_x; c <= insert_to_x; c++) {
-					color = selection.get_pixel(r - insert_y, c - insert_x);
+	if (SCAN_CODE_DEL == keycode) {
+		selection_start_x = -1;
-					if (TOIMAGE == target)
+		selection_start_y = -1;
-						image.set_pixel(r, c, color);
+		selection_end_x = -1;
-					else
+		selection_end_y = -1;
-						DrawCanvasPixel(r, c, color);
-			}
 		selection_state = STATE_INACTIVE;
-	}
+		DrawCanvas();
+	}
-}
+	if (SCAN_CODE_ESC == keycode) {
+		reset_selection();
-void SelectTool_onKeyEvent(dword keycode) {
+		DrawCanvas();
-	dword r, c;
 	if (keycode == SCAN_CODE_KEY_V) {
-		if (STATE_SELECTED == selection_state) {
-			reset_selection();
+	if (SCAN_CODE_KEY_V == keycode) {
-			selection_state = STATE_SELECTED;
+		if (STATE_SELECTED == selection_state) {
 			selection_start_x = 0;
-			selection_end_x = selection.columns - 1;
+			selection_start_x = 0;
 			selection_start_y = 0;
-			selection_start_y = 0;
+			selection_end_x = selection.columns - 1;
 			selection_end_y = selection.rows - 1;
 			DrawCanvas();
 			DrawCanvas();
-		}
+	}
-	}
-}
-void DrawSelection() {
-	#define SELECTION_COLOR 0xAAE5EF
-	int p1x, p1y, p2x, p2y, r, c, old_color, new_color;
-	if (selection_start_x <= selection_end_x) {
+}
-		p1x = selection_start_x;
-		p2x = selection_end_x;
-	}
-	else {
-		p1x = selection_end_x;
-		p2x = selection_start_x;
-	}
+void SelectTool_onCanvasDraw()
+{
+	#define SELECTION_COLOR 0xAAE5EF
+	int p1x, p1y, p2x, p2y, r, c, old_color, new_color;
 	if (selection_start_y <= selection_end_y) {
-		p2y = selection_start_y;
+	if ((selection_start_x >= 0) && (selection_start_y >= 0) && (selection_end_x >= 0) && (selection_end_y >= 0)) {
 		p1y = selection_end_y;
 		p1x = math.min(selection_start_x, selection_end_x);
-			DrawCanvasPixel(r, c, new_color);
+				DrawCanvasPixel(r, c, new_color);
+			}
+		}
+	}
+}

Subversion Repositories Kolibri OS

(root)/programs/cmm/iconedit/tools/selection.h – Rev 7268 → 7271