Implemented first basic steps towards nice graph rendering.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@346 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

1 files changed, 20 insertions, 6 deletions

diff --git a/src/gtkext/gtkgraphview.c b/src/gtkext/gtkgraphview.c
index cb5c587..52d718b 100644
--- a/src/gtkext/gtkgraphview.c
+++ b/src/gtkext/gtkgraphview.c
@@ -194,6 +194,7 @@ static void gtk_graph_view_init(GtkGraphView *view)
 *  Remarques   : -                                                            *
 *                                                                             *
 ******************************************************************************/
+
 static void gtk_graph_view_size_request(GtkWidget *widget, GtkRequisition *requisition)
 {
     gpointer fixed_class;                   /* Classe parente              */
@@ -209,9 +210,22 @@ static void gtk_graph_view_size_request(GtkWidget *widget, GtkRequisition *requi
 
     view = GTK_GRAPH_VIEW(widget);
 
+    if (view->layout != NULL)
+        g_graph_layout_size_request(view->layout, requisition);
+
+
+
+    //requisition->width += 65;
+    //requisition->height += 65;
+
+    view = GTK_GRAPH_VIEW(widget);
+
+    /*
     requisition->width += GTK_VIEW_PANEL(widget)->hadjustment->value;
     requisition->height += GTK_VIEW_PANEL(widget)->vadjustment->value;
+    */
 
+#if 0
     /**
      * On s'assure de ne couper aucun lien.
      */
@@ -237,6 +251,7 @@ static void gtk_graph_view_size_request(GtkWidget *widget, GtkRequisition *requi
 
     if (left_corner != G_MAXINT) requisition->width += left_corner;
     if (top_corner != G_MAXINT) requisition->height += top_corner;
+#endif
 
 }
 
@@ -394,8 +409,6 @@ static void gtk_graph_view_define_main_address(GtkGraphView *view, vmpa_t addr)
                                                        sizeof(GtkAllocation));
 
 
-                printf("Passage !!!\n");
-
                 /*
                 build_graph_view(view, g_binary_routine_get_basic_blocks(view->routine),
                                  view->children, view->children_count);
@@ -404,12 +417,8 @@ static void gtk_graph_view_define_main_address(GtkGraphView *view, vmpa_t addr)
                 view->layout = g_graph_layout_new(g_binary_routine_get_basic_blocks(view->routine),
                                                   view->children, view->children_count);
 
-                printf("----\n");
-
                 g_graph_layout_place(view->layout, view);
 
-                printf("--- done !!!\n");
-
                 break;
 
             }
@@ -444,8 +453,13 @@ static void gtk_graph_view_prepare_resize(GtkGraphView *view)
         for (i = 0; i < view->children_count; i++)
             gtk_widget_queue_resize(GTK_WIDGET(view->children[i]));
 
+        /*
         build_graph_view(view, g_binary_routine_get_basic_blocks(view->routine),
                          view->children, view->children_count);
+        */
+
+        g_graph_layout_refresh(view->layout);
+        g_graph_layout_place(view->layout, view);
 
         change_editor_items_current_view_content(GTK_VIEW_PANEL(view));