- Se arregla problema de dibujo de lineas.

- Se dibujan lineas horizontales.
- Se mejora el hot spot del drag&drop.

diff --git a/tests/GUI/dndwindow.cc b/tests/GUI/dndwindow.cc
index f18ee57f83f24925b69c8dbe294ebc83cb000170..8bf40c41193ed847b8a5397741d86ef29aa9197a 100644 (file)
--- a/tests/GUI/dndwindow.cc
+++ b/tests/GUI/dndwindow.cc
@@ -34,13 +34,15 @@ DnDWindow::DnDWindow()
 
   add(m_HBox);
 
 
   add(m_HBox);
 

-       m_HBox.pack_start(m_VBox);
+       m_HBox.pack_start(m_VBox, false, false, 0);

        
        m_VBox.pack_start(m_Button_Canio);
        m_VBox.pack_start(m_Button_Y);
        m_VBox.pack_start(m_Button_Codo);
 
        
        m_VBox.pack_start(m_Button_Canio);
        m_VBox.pack_start(m_Button_Y);
        m_VBox.pack_start(m_Button_Codo);
 

-       m_HBox.pack_start(m_WorkPlace);
+       m_HBox.pack_start(scroll);
+       scroll.add(m_WorkPlace);
+       scroll.set_size_request(600, 600);

        m_WorkPlace.set_size_request(600, 600);
 
   //Targets:
        m_WorkPlace.set_size_request(600, 600);
 
   //Targets:


@@ -85,17 +87,17 @@ void DnDWindow::on_item_button_down()
 
 void DnDWindow::on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext> &context)
 {
 
 void DnDWindow::on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext> &context)
 {

-       context->set_icon(ico_canio, 0, 0); //ico_canio->get_width(), ico_canio->get_height());
+       context->set_icon(ico_canio, 5, 5); //ico_canio->get_width(), ico_canio->get_height());

 }
 
 void DnDWindow::on_y_drag_begin(const Glib::RefPtr<Gdk::DragContext> &context)
 {
 }
 
 void DnDWindow::on_y_drag_begin(const Glib::RefPtr<Gdk::DragContext> &context)
 {

-       context->set_icon(ico_y, 0, 0); //ico_canio->get_width(), ico_canio->get_height());
+       context->set_icon(ico_y, 5, 5); //ico_canio->get_width(), ico_canio->get_height());

 }
 
 void DnDWindow::on_codo_drag_begin(const Glib::RefPtr<Gdk::DragContext> &context)
 {
 }
 
 void DnDWindow::on_codo_drag_begin(const Glib::RefPtr<Gdk::DragContext> &context)
 {

-       context->set_icon(ico_codo, 0, 0); //ico_canio->get_width(), ico_canio->get_height());
+       context->set_icon(ico_codo, 5, 5); //ico_canio->get_width(), ico_canio->get_height());

 }
 
 
 }
 
 

diff --git a/tests/GUI/dndwindow.h b/tests/GUI/dndwindow.h
index eeda3e3fecca44d8ee743774e2c73b59e90fb729..8e6fa6bc34ff6ef1c307bedf09da369171ee6f98 100644 (file)
--- a/tests/GUI/dndwindow.h
+++ b/tests/GUI/dndwindow.h
@@ -26,6 +26,7 @@
 #include <gtkmm/fixed.h>
 #include "item.h"
 #include "workplace.h"
 #include <gtkmm/fixed.h>
 #include "item.h"
 #include "workplace.h"

+#include <gtkmm/scrolledwindow.h>

 
 class DnDWindow : public Gtk::Window
 {
 
 class DnDWindow : public Gtk::Window
 {


@@ -54,6 +55,7 @@ protected:
        Gtk::Button m_Button_Codo;
   WorkPlace m_WorkPlace;
        std::list<CItem *> listaItems;
        Gtk::Button m_Button_Codo;
   WorkPlace m_WorkPlace;
        std::list<CItem *> listaItems;

+       Gtk::ScrolledWindow scroll;

 };
 
 #endif // GTKMM_EXAMPLE_DNDWINDOW_H
 };
 
 #endif // GTKMM_EXAMPLE_DNDWINDOW_H

diff --git a/tests/GUI/workplace.cc b/tests/GUI/workplace.cc
index 4c11f6c5a862f4c681979c6c7b2cd561019fe342..b046a680f6846ac23a4c946a94a9e4c26290b2a5 100644 (file)
--- a/tests/GUI/workplace.cc
+++ b/tests/GUI/workplace.cc
@@ -12,6 +12,9 @@ bool WorkPlace::on_expose_event(GdkEventExpose *e)
        for(i=0; i<get_width(); i+=32) {
                get_window()->draw_line(get_style()->get_black_gc(), i, 0, i, get_height());
        }
        for(i=0; i<get_width(); i+=32) {
                get_window()->draw_line(get_style()->get_black_gc(), i, 0, i, get_height());
        }

+       for(i=0; i<get_height(); i+=32) {
+               get_window()->draw_line(get_style()->get_black_gc(), 0, i, get_width(), i);
+       }

 
        return true;
 }
 
        return true;
 }