gEDA-cvs: gaf.git: branch: master updated (1.6.1-20100214-89-gc3e6a00)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  c3e6a002e3361f4341e7e09557cf12c4dbfd0c8b (commit)
      from  fc0d1ec31bc40dce2a511efae25530c32533fb2e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gschem/src/o_grips.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


=================
 Commit Messages
=================

commit c3e6a002e3361f4341e7e09557cf12c4dbfd0c8b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    gschem: Cancel box grip operation if height is collapsed to zero
    
    The cancel worked for the case where width was collapsed to zero, but
    not height. Seems to be due to 1) To a copy-paste error meaning the
    box height was always read as zero, and 2) A logic error in that either
    a zero width, OR zero height box should abort the grip opeation.

:100644 100644 e99a75d... 3008e1d... M	gschem/src/o_grips.c

=========
 Changes
=========

commit c3e6a002e3361f4341e7e09557cf12c4dbfd0c8b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    gschem: Cancel box grip operation if height is collapsed to zero
    
    The cancel worked for the case where width was collapsed to zero, but
    not height. Seems to be due to 1) To a copy-paste error meaning the
    box height was always read as zero, and 2) A logic error in that either
    a zero width, OR zero height box should abort the grip opeation.

diff --git a/gschem/src/o_grips.c b/gschem/src/o_grips.c
index e99a75d..3008e1d 100644
--- a/gschem/src/o_grips.c
+++ b/gschem/src/o_grips.c
@@ -29,7 +29,7 @@
 #endif
 
 #define GET_BOX_WIDTH(w)  abs((w)->second_wx - (w)->first_wx)
-#define GET_BOX_HEIGHT(w) abs((w)->second_wy - (w)->second_wy)
+#define GET_BOX_HEIGHT(w) abs((w)->second_wy - (w)->first_wy)
 
 #define GET_PICTURE_WIDTH(w)			\
   abs((w)->second_wx - (w)->first_wx) 
@@ -1200,7 +1200,7 @@ void o_grips_end_box(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
   /* don't allow zero width/height boxes
    * this ends the box drawing behavior
    * we want this? hack */
-  if ((box_width == 0) && (box_height == 0)) {
+  if ((box_width == 0) || (box_height == 0)) {
     o_invalidate (w_current, o_current);
     return;
   }




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs