summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/GraphCanvas.cpp12
-rw-r--r--src/gui/wscript2
2 files changed, 13 insertions, 1 deletions
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 4d1daa87..12c60638 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -61,6 +61,17 @@ using namespace Client;
namespace GUI {
+static int
+port_order(const GanvPort* a, const GanvPort* b, void* data)
+{
+ const Port* pa = dynamic_cast<const Port*>(Glib::wrap(a));
+ const Port* pb = dynamic_cast<const Port*>(Glib::wrap(b));
+ if (pa && pb) {
+ return ((int)pa->model()->index() - (int)pb->model()->index());
+ }
+ return 0;
+}
+
GraphCanvas::GraphCanvas(App& app,
SPtr<const GraphModel> graph,
int width,
@@ -159,6 +170,7 @@ GraphCanvas::GraphCanvas(App& app,
show_human_names(app.world()->conf().option("human-names").get<int32_t>());
show_port_names(app.world()->conf().option("port-labels").get<int32_t>());
+ set_port_order(port_order, NULL);
}
void
diff --git a/src/gui/wscript b/src/gui/wscript
index ecbf0119..fe54ad1a 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -9,7 +9,7 @@ def configure(conf):
autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='NEW_GTKMM',
atleast_version='2.14.0', mandatory=False)
autowaf.check_pkg(conf, 'ganv-1', uselib_store='GANV',
- atleast_version='1.5.0', mandatory=False)
+ atleast_version='1.5.2', mandatory=False)
if not Options.options.no_webkit:
autowaf.check_pkg(conf, 'webkit-1.0', uselib_store='WEBKIT',
atleast_version='1.4.0', mandatory=False)