gEDA-cvs: branch: master updated (1.4.0-20080127-77-gd76dfc0)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  d76dfc090cd97a1aa582fd215468ec6b6d234f57 (commit)
      from  de5a6de1643a041e70acf1f27b02281fe16f23b7 (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_basic.c      |    2 --
 gschem/src/x_compselect.c |   24 ++++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)


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

commit d76dfc090cd97a1aa582fd215468ec6b6d234f57
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sun May 18 13:55:38 2008 +0100

    Remove bounding box undraws in DRAWTEXT and DRAWCOMP states
    
    These two states are used when no drawing has yet hit the screen,
    so there should not be XOR drawing calls to "undraw" changes which
    haven't been made.

:100644 100644 0da381d... 2ea6e5e... M	gschem/src/o_basic.c
:100644 100644 6052d1a... 7001ae7... M	gschem/src/x_compselect.c

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

commit d76dfc090cd97a1aa582fd215468ec6b6d234f57
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sun May 18 13:55:38 2008 +0100

    Remove bounding box undraws in DRAWTEXT and DRAWCOMP states
    
    These two states are used when no drawing has yet hit the screen,
    so there should not be XOR drawing calls to "undraw" changes which
    haven't been made.

diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index 0da381d..2ea6e5e 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -69,13 +69,11 @@ void o_redraw_all(GSCHEM_TOPLEVEL *w_current)
                        x_get_darkcolor(w_current->bb_color), TRUE);
         break;
 
-      case(DRAWCOMP):
       case(ENDCOMP):
         o_drawbounding(w_current, toplevel->page_current->complex_place_list,
                        x_get_darkcolor(w_current->bb_color), TRUE);
         break;
 
-      case(DRAWTEXT):
       case(ENDTEXT):
         o_drawbounding(w_current, toplevel->page_current->attrib_place_list,
                        x_get_darkcolor(w_current->bb_color), TRUE);
diff --git a/gschem/src/x_compselect.c b/gschem/src/x_compselect.c
index 6052d1a..7001ae7 100644
--- a/gschem/src/x_compselect.c
+++ b/gschem/src/x_compselect.c
@@ -142,16 +142,20 @@ x_compselect_callback_response (GtkDialog *dialog,
               g_assert_not_reached();
         }
 
-        if (w_current->event_state == ENDCOMP ||
-            w_current->event_state == DRAWCOMP) {
-          /* Delete the component which was being placed */
-          o_complex_rubbercomplex(w_current);
-          s_delete_object_glist(toplevel,
-                                toplevel->page_current->complex_place_list);
-          toplevel->page_current->complex_place_list = NULL;
-        } else {
-          /* Cancel whatever other action is currently in progress */
-          o_redraw_cleanstates (w_current);
+        switch (w_current->event_state) {
+          case ENDCOMP:
+            /* Undraw the component which was being placed */
+            o_complex_rubbercomplex(w_current);
+            /* Fall through */
+          case DRAWCOMP:
+            s_delete_object_glist(toplevel,
+                                  toplevel->page_current->complex_place_list);
+            toplevel->page_current->complex_place_list = NULL;
+            break;
+
+          default:
+            /* Cancel whatever other action is currently in progress */
+            o_redraw_cleanstates (w_current);
         }
 
         if (symbol == NULL) {




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