Changeset 41341 for trunk/Ohana/src/kapa2/src/Image.c

Timestamp:

Apr 16, 2020, 2:04:27 PM (6 years ago)

Author:

tdeboer

Message:

quick undo

File:

• trunk/Ohana/src/kapa2/src/Image.c (modified) (3 diffs)

trunk/Ohana/src/kapa2/src/Image.c

@@ -148 +148 @@
 void DrawImage (KapaImageWidget *image) {
 
+  Graphic *graphic;
+
+  if (image == NULL) return;
+
+  graphic = GetGraphic ();
+
+  if (image[0].picture.pix) {
+    XPutImage (graphic[0].display, graphic[0].window, graphic[0].gc,
+               image[0].picture.pix, 0, 0, 
+               image[0].picture.x + 1, image[0].picture.y + 1, 
+               image[0].picture.dx, image[0].picture.dy);
+  }
+}
+
+// add the zoom, pan, crosshairs, status box, buttons
+void DrawImageTool (KapaImageWidget *image) {
+
   int i;
   Graphic *graphic;
@@ -160 +177 @@
                   image[0].picture.dx+1, image[0].picture.dy+1);
   
-  if (image[0].picture.pix) {
-    XPutImage (graphic[0].display, graphic[0].window, graphic[0].gc,
-               image[0].picture.pix, 0, 0, 
-               image[0].picture.x + 1, image[0].picture.y + 1, 
-               image[0].picture.dx, image[0].picture.dy);
-  }
-
-  for (i = 0; i < NOVERLAYS; i++) {
-    if (image[0].overlay[i].active) {
-      PaintOverlay (graphic, image, i);
-    }
-  }
-
   if (image[0].location) {
     if (image[0].cmapbar.pix) {
@@ -211 +215 @@
     StatusBox (graphic, image);
   }
-
-  FlushDisplay ();
 }