* Los colores ya estan completamente arreglados

[z.facultad/75.42/plaqui.git] / Client / src / item_union.cpp

diff --git a/Client/src/item_union.cpp b/Client/src/item_union.cpp
index 08bad4ed80fa04d59b7e7e85b47eca2826fb9ab5..eee974e2aa8110c4f4c4ec5c8a114725d09901e1 100644 (file)
--- a/Client/src/item_union.cpp
+++ b/Client/src/item_union.cpp
@@ -28,29 +28,39 @@ ViewUnion::~ViewUnion()
 
 bool ViewUnion::on_image_expose_event(GdkEventExpose *e)
 {
-       Glib::RefPtr<Gdk::Colormap> colormap = image.get_colormap();
-       Gdk::Color blanco = Gdk::Color("white");
-       colormap->alloc_color(color);
-       colormap->alloc_color(blanco);
+       Glib::RefPtr<Gdk::Colormap> colormap = Gtk::Widget::get_default_colormap();
+       if (!colormap->alloc_color(color, false, false)) {
+               std::cout << "ERROR ALOCANDO COLOR!" << std::endl;
+       }
        gc->set_foreground(color);
        gc->set_background(color);
+       
+       if (name == "union6") {
+               std::cout << color.get_red() << " " << color.get_green() << " " << color.get_blue() << std::endl;
+       }
        int w,h;
        w = image.get_width();
        h = image.get_height();
-       switch (m_or) {
-               case 0:
-                       image.get_window()->draw_rectangle(gc, 1, w/2-2, h/2, 4, h/2);
-                       gc->set_foreground(blanco);
-                       image.get_window()->draw_rectangle(gc, 0, w/2-3, h/2-1, 6, h/2);
-               break;
-               case 1:
-                       image.get_window()->draw_rectangle(gc, 1, 0, h/2-2, w/2, 4);
-               break;
-               case 2:
-                       image.get_window()->draw_rectangle(gc, 1, w/2-2, 0, 4, h/2);
-               break;
-               case 3:
-                       image.get_window()->draw_rectangle(gc, 1, w/2, h/2-2, w/2, 4);
+       if (actual_flow > 0) {
+               switch (m_or) {
+                       case 0:
+                               image.get_window()->draw_rectangle(gc, 1, w/2-3, 16, 6, h-16);
+                               image.get_window()->draw_rectangle(gc, 1, 0, 13, w, 6);
+                       break;
+                       case 1:
+                               image.get_window()->draw_rectangle(gc, 1, 0, h/2-3, w/2, 6);
+                               image.get_window()->draw_rectangle(gc, 1, 51, 0, 6, h);
+                       break;
+                       case 2:
+                               image.get_window()->draw_rectangle(gc, 1, w/2-3, 0, 6, h/2);
+                               image.get_window()->draw_rectangle(gc, 1, 0, 51, w, 6);
+                       break;
+                       case 3:
+                               image.get_window()->draw_rectangle(gc, 1, w/2, h/2-3, w/2, 6);
+                               image.get_window()->draw_rectangle(gc, 1, 16, 0, 6, h);
+               }
        }
+       return true;
 }
 
+