X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/65e0e3da6246674b0014c3a7c10aeecb61499725..ea7708f0d91b00a54cc5f136a67e9f9bd272329d:/Constructor/src/exclusa.cpp?ds=sidebyside diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp index ee75ed5..b0210f2 100644 --- a/Constructor/src/exclusa.cpp +++ b/Constructor/src/exclusa.cpp @@ -41,15 +41,17 @@ bool Exclusa::on_button_press_event(GdkEventButton *event) { t_line tmp_line; if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) { - combo_entry->set_text(name); + list_pointed->push_back(name); + combo_entry->set_popdown_strings(*list_pointed); + combo_entry->get_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 +67,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; @@ -253,10 +255,10 @@ void Exclusa::update_logic_position() { switch (imgActual) { case 1: - 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; case 0: in_x = x + image->get_width()/2;