Changeset 39577 for trunk

Timestamp:

May 13, 2016, 12:05:21 PM (10 years ago)

Author:

eugene

Message:

fix reset for default font after draw / erase labels

Location:

trunk/Ohana/src/kapa2/src

Files:

• DrawLabels.c (modified) (2 diffs)
• LoadLabels.c (modified) (1 diff)

trunk/Ohana/src/kapa2/src/DrawLabels.c

@@ -21 +21 @@
   int i, pos, x, y, size;
   double angle;
-  char *fontname;
+  char *fontname, defaultname[64];
 
+  // save the current default font and size
   pos = 0;
   fontname = GetRotFont (&size);
+  strcpy (defaultname, fontname);
+
   XSetForeground (graphic->display, graphic->gc, color);
   DrawRotTextInit (graphic->display, graphic->window, graphic->gc, color, graphic->back);
@@ -48 +51 @@
     }
   }
-  SetRotFont (fontname, size);
+  SetRotFont (defaultname, size);
 }
 

trunk/Ohana/src/kapa2/src/LoadLabels.c

@@ -27 +27 @@
   
   c = GetRotFont (&size);
+
   graph[0].label[mode].size = size;
   strcpy (graph[0].label[mode].font, c);