use less glaring colors for active/selected/etc states, fix transitions bug

diff --git a/lib/common/const.h b/lib/common/const.h
index 91711d10d90f68d91dcb9f2f54080f26659ac00d..6afa6711c4870137f8a4038b17a5503a470b2bf0 100644 (file)
--- a/lib/common/const.h
+++ b/lib/common/const.h
@@ -52,18 +52,18 @@
 
 /* default attributes */
 #define                DEFAULT_COLOR           "black"
-#define                DEFAULT_ACTIVEPENCOLOR  "yellow"
-#define                DEFAULT_ACTIVEFILLCOLOR "yellow"
+#define                DEFAULT_ACTIVEPENCOLOR  "#808080"
+#define                DEFAULT_ACTIVEFILLCOLOR "#fcfcfc"
 #define                DEFAULT_ACTIVEFONTCOLOR "black"
-#define                DEFAULT_SELECTEDPENCOLOR        "orange"
-#define                DEFAULT_SELECTEDFILLCOLOR       "orange"
-#define                DEFAULT_SELECTEDFONTCOLOR       "black"
-#define                DEFAULT_DELETEDPENCOLOR "lightgrey"
-#define                DEFAULT_DELETEDFILLCOLOR        "lightgrey"
-#define                DEFAULT_DELETEDFONTCOLOR        "darkgrey"
-#define                DEFAULT_VISITEDPENCOLOR "pink"
-#define                DEFAULT_VISITEDFILLCOLOR        "pink"
-#define                DEFAULT_VISITEDFONTCOLOR        "black"
+#define                DEFAULT_SELECTEDPENCOLOR "#303030"
+#define                DEFAULT_SELECTEDFILLCOLOR "#e8e8e8"
+#define                DEFAULT_SELECTEDFONTCOLOR "black"
+#define                DEFAULT_DELETEDPENCOLOR "#e0e0e0"
+#define                DEFAULT_DELETEDFILLCOLOR "#f0f0f0"
+#define                DEFAULT_DELETEDFONTCOLOR "darkgrey"
+#define                DEFAULT_VISITEDPENCOLOR "#101010"
+#define                DEFAULT_VISITEDFILLCOLOR "#f8f8f8"
+#define                DEFAULT_VISITEDFONTCOLOR "black"
 #define                DEFAULT_FONTSIZE        14.0
 #define                DEFAULT_LABEL_FONTSIZE  11.0    /* for head/taillabel */
 #define                MIN_FONTSIZE            1.0

diff --git a/lib/common/emit.c b/lib/common/emit.c
index f2268a140e0e3acdbe44a473d8a1658eaa25c3f0..f5f407c9360e3bac2df1029604aa9d41f07562ae 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -728,7 +728,7 @@ static bool edge_in_view(GVJ_t *job, edge_t * e)
 void emit_edge_graphics(GVJ_t * job, edge_t * e)
 {
     int i, j, cnum, numc = 0;
-    char *color, *style;
+    char *color, *pencolor, *fillcolor, *style;
     char *colors = NULL;
     char **styles = 0;
     char **sp;
@@ -774,28 +774,26 @@ void emit_edge_graphics(GVJ_t * job, edge_t * e)
            if (*p == ':')
                numc++;
 
-       if (ED_selected(e)) {
-           color = late_nnstring(e, E_selectedpencolor, DEFAULT_SELECTEDPENCOLOR);
-           gvrender_set_pencolor(job, color);
-           color = late_nnstring(e, E_selectedfillcolor, DEFAULT_SELECTEDFILLCOLOR);
-           gvrender_set_fillcolor(job, color);
+       fillcolor = pencolor = color;
+       if (ED_active(e)) {
+           pencolor = late_nnstring(e, E_activepencolor, DEFAULT_ACTIVEPENCOLOR);
+           fillcolor = late_nnstring(e, E_activefillcolor, DEFAULT_ACTIVEFILLCOLOR);
        }
-       else if (ED_active(e)) {
-           color = late_nnstring(e, E_activepencolor, DEFAULT_ACTIVEPENCOLOR);
-           gvrender_set_pencolor(job, color);
-           color = late_nnstring(e, E_activefillcolor, DEFAULT_ACTIVEFILLCOLOR);
-           gvrender_set_fillcolor(job, color);
+       else if (ED_selected(e)) {
+           pencolor = late_nnstring(e, E_selectedpencolor, DEFAULT_SELECTEDPENCOLOR);
+           fillcolor = late_nnstring(e, E_selectedfillcolor, DEFAULT_SELECTEDFILLCOLOR);
        }
        else if (ED_deleted(e)) {
-           color = late_nnstring(e, E_deletedpencolor, DEFAULT_DELETEDPENCOLOR);
-           gvrender_set_pencolor(job, color);
-           color = late_nnstring(e, E_deletedfillcolor, DEFAULT_DELETEDFILLCOLOR);
-           gvrender_set_fillcolor(job, color);
+           pencolor = late_nnstring(e, E_deletedpencolor, DEFAULT_DELETEDPENCOLOR);
+           fillcolor = late_nnstring(e, E_deletedfillcolor, DEFAULT_DELETEDFILLCOLOR);
        }
        else if (ED_visited(e)) {
-           color = late_nnstring(e, E_visitedpencolor, DEFAULT_VISITEDPENCOLOR);
+           pencolor = late_nnstring(e, E_visitedpencolor, DEFAULT_VISITEDPENCOLOR);
+           fillcolor = late_nnstring(e, E_visitedfillcolor, DEFAULT_VISITEDFILLCOLOR);
+       }
+       if (pencolor != color) {
+           color = pencolor;
            gvrender_set_pencolor(job, color);
-           color = late_nnstring(e, E_visitedfillcolor, DEFAULT_VISITEDFILLCOLOR);
            gvrender_set_fillcolor(job, color);
        }
        /* if more than one color - then generate parallel beziers, one per color */
@@ -1406,16 +1404,16 @@ void emit_clusters(GVJ_t * job, Agraph_t * g, int flags)
                    break;
                }
        }
-       if (GD_selected(sg)) {
-           color = late_nnstring(sg, G_activepencolor, DEFAULT_SELECTEDPENCOLOR);
+       if (GD_active(sg)) {
+           color = late_nnstring(sg, G_activepencolor, DEFAULT_ACTIVEPENCOLOR);
            gvrender_set_pencolor(job, color);
-           color = late_nnstring(sg, G_activefillcolor, DEFAULT_SELECTEDFILLCOLOR);
+           color = late_nnstring(sg, G_activefillcolor, DEFAULT_ACTIVEFILLCOLOR);
            gvrender_set_fillcolor(job, color);
        }
-       else if (GD_active(sg)) {
-           color = late_nnstring(sg, G_activepencolor, DEFAULT_ACTIVEPENCOLOR);
+       else if (GD_selected(sg)) {
+           color = late_nnstring(sg, G_activepencolor, DEFAULT_SELECTEDPENCOLOR);
            gvrender_set_pencolor(job, color);
-           color = late_nnstring(sg, G_activefillcolor, DEFAULT_ACTIVEFILLCOLOR);
+           color = late_nnstring(sg, G_activefillcolor, DEFAULT_SELECTEDFILLCOLOR);
            gvrender_set_fillcolor(job, color);
        }
        else if (GD_deleted(sg)) {

diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index f73e701aae5a9e49aef454f94bbcf0abd61d2d6e..269eac2a1cbfeb9e819807c99e2166f6eedbe3bc 100644 (file)
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -1213,17 +1213,17 @@ static void poly_gencode(GVJ_t * job, node_t * n)
     } else {
        style = stylenode(job, n);
     }
-    if (ND_selected(n)) {
-        color = late_nnstring(n, N_selectedpencolor, DEFAULT_SELECTEDPENCOLOR);
+    if (ND_active(n)) {
+        color = late_nnstring(n, N_activepencolor, DEFAULT_ACTIVEPENCOLOR);
         gvrender_set_pencolor(job, color);
-        color = late_nnstring(n, N_selectedfillcolor, DEFAULT_SELECTEDFILLCOLOR);
+        color = late_nnstring(n, N_activefillcolor, DEFAULT_ACTIVEFILLCOLOR);
         gvrender_set_fillcolor(job, color);
        filled = TRUE;
     }
-    else if (ND_active(n)) {
-        color = late_nnstring(n, N_activepencolor, DEFAULT_ACTIVEPENCOLOR);
+    else if (ND_selected(n)) {
+        color = late_nnstring(n, N_selectedpencolor, DEFAULT_SELECTEDPENCOLOR);
         gvrender_set_pencolor(job, color);
-        color = late_nnstring(n, N_activefillcolor, DEFAULT_ACTIVEFILLCOLOR);
+        color = late_nnstring(n, N_selectedfillcolor, DEFAULT_SELECTEDFILLCOLOR);
         gvrender_set_fillcolor(job, color);
        filled = TRUE;
     }

diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c
index 7d0dc3c63c8073f3a4c04b26ddec76144c64ceb2..42881e986ed18d8ad3fc78e89dcf1fba72dff091 100644 (file)
--- a/lib/gvc/gvevent.c
+++ b/lib/gvc/gvevent.c
@@ -224,15 +224,12 @@ static void gvevent_leave_obj(GVJ_t * job)
     if (obj) {
         switch (agobjkind(obj)) {
         case AGGRAPH:
-           GD_visited((graph_t*)obj) = true;
            GD_active((graph_t*)obj) = false;
            break;
         case AGNODE:
-           ND_visited((node_t*)obj) = true;
            ND_active((node_t*)obj) = false;
            break;
         case AGEDGE:
-           ED_visited((edge_t*)obj) = true;
            ED_active((edge_t*)obj) = false;
            break;
         }
@@ -323,12 +320,15 @@ static void gvevent_select_current_obj(GVJ_t * job)
     if (obj) {
         switch (agobjkind(obj)) {
         case AGGRAPH:
+           GD_visited((graph_t*)obj) = true;
            GD_selected((graph_t*)obj) = false;
            break;
         case AGNODE:
+           ND_visited((node_t*)obj) = true;
            ND_selected((node_t*)obj) = false;
            break;
         case AGEDGE:
+           ED_visited((edge_t*)obj) = true;
            ED_selected((edge_t*)obj) = false;
            break;
         }