From: Nicolás Dimov <ndimov@gmail.com>
Date: Sun, 23 Nov 2003 23:28:31 +0000 (+0000)
Subject: ahi quedo mas bonito
X-Git-Tag: svn_import~190
X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/commitdiff_plain/5f3d1517e8f6cd322669c60257ca28400e0399ab?ds=sidebyside

ahi quedo mas bonito
---

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index 2f7a02c..147cc5b 100644
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -3,7 +3,7 @@
 
 Cistern::Cistern(int orientacion)
 {
-	in_x = x;
+	in_x = x+5;
 	in_y = y+16;
 	out_x = x + 48;
 	out_y = y + 64;
@@ -47,12 +47,12 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 		combo_entry->set_text(name);
 		WorkPlace::pointed = ID;
 		if (CItem::logic_connect && CItem::gate_id != -1) {
-			if ( detect_click_position(event->x, event->y) == IN ){
+			if ( detect_click_position((int)event->x, (int)event->y) == IN ){
 				tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
 				tmp_line.store_id = ID;
 				workplace->lista_lineas_in.push_back(tmp_line);
 				workplace->queue_draw();
-			} else if (detect_click_position(event->x, event->y) == OUT) { 
+			} else if (detect_click_position((int)event->x, (int)event->y) == OUT) { 
 				tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
 				tmp_line.store_id = ID;
 				workplace->lista_lineas_out.push_back(tmp_line);
@@ -68,7 +68,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 		switch (imgActual) {
 			case 1:
 				image = imageO;
-				in_x = x + image->get_width();
+				in_x = x + image->get_width()-5;
 				in_y = y + 16;
 				out_x = x+16;
 				out_y = y + image->get_height();
@@ -76,7 +76,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 			default: 
 				imgActual = 0;
 				image = imageE;			
-				in_x = x;
+				in_x = x+5;
 				in_y = y+16;
 				out_x = x + image->get_width() -16;
 				out_y = y + image->get_height();
diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index ee75ed5..7c70848 100644
--- a/Constructor/src/exclusa.cpp
+++ b/Constructor/src/exclusa.cpp
@@ -44,12 +44,12 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
 		combo_entry->set_text(name);
 		WorkPlace::pointed = ID;
 		if (CItem::logic_connect && CItem::gate_id != -1) {
-			if ( detect_click_position(event->x, event->y) == IN) {
+			if ( detect_click_position((int)event->x, (int)event->y) == IN) {
 				tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
 				tmp_line.store_id = ID;
 				workplace->lista_lineas_in.push_back(tmp_line);
 				workplace->queue_draw();	
-			} else if (detect_click_position(event->x, event->y) == OUT) {	
+			} else if (detect_click_position((int)event->x, (int)event->y) == OUT) {	
 				tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
 				tmp_line.store_id = ID;
 				workplace->lista_lineas_out.push_back(tmp_line);
@@ -65,10 +65,10 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
 		switch (imgActual) {
 			case 1:
 				image = imageS;
-				in_x = x + image->get_width();
-				in_y = y + image->get_height()/2;
-				out_x = x;
-				out_y = in_y;
+				in_x = x + image->get_width()-5;
+				in_y = y + image->get_height()/2-5;
+				out_x = x+5;
+				out_y = in_y+10;
 				break;
 			default: 
 				imgActual = 0;