gEDA-cvs: gaf.git: branch: stable-1.8 updated (1.7.2-20111231-60-g72be40e)

[git@xxxxxxxxxx]

The branch, stable-1.8 has been updated
       via  72be40e1081e56050a81e73e74c5a4e0c645fe3d (commit)
       via  97bea3a73c9c8d25d54454ea28a942b9c9c38c57 (commit)
      from  1e057e8fdb3d924e02d9c03d0b4fd2af3d26e2c5 (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_select.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


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

commit 72be40e1081e56050a81e73e74c5a4e0c645fe3d
Author: Nathan Schulte <nmschulte@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Fix a bug with invert selection
    
    When invert selecting "nothing", all currently selected objects are
    deselected.  This is annoying when you "miss" trying to invert select a
    small group of objects.  This is now fixed such that "missing" and
    selecting "nothing" does not deselect everything.
    
    Closes-bug: lp-912489

:100644 100644 db3b92e... 7db697a... M	gschem/src/o_select.c

commit 97bea3a73c9c8d25d54454ea28a942b9c9c38c57
Author: Nathan Schulte <nmschulte@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Fix bug with invert selection and attributes
    
    This fixes a bug that causes attributes to be left unselected when
    selected in the same select box as their parent object.
    
    Closes-bug: lp-912475

:100644 100644 71e72e2... db3b92e... M	gschem/src/o_select.c

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

commit 72be40e1081e56050a81e73e74c5a4e0c645fe3d
Author: Nathan Schulte <nmschulte@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Fix a bug with invert selection
    
    When invert selecting "nothing", all currently selected objects are
    deselected.  This is annoying when you "miss" trying to invert select a
    small group of objects.  This is now fixed such that "missing" and
    selecting "nothing" does not deselect everything.
    
    Closes-bug: lp-912489

diff --git a/gschem/src/o_select.c b/gschem/src/o_select.c
index db3b92e..7db697a 100644
--- a/gschem/src/o_select.c
+++ b/gschem/src/o_select.c
@@ -286,6 +286,7 @@ void o_select_box_search(GSCHEM_TOPLEVEL *w_current)
   OBJECT *o_current=NULL;
   int count = 0; /* object count */
   int SHIFTKEY = w_current->SHIFTKEY;
+  int CONTROLKEY = w_current->CONTROLKEY;
   int left, right, top, bottom;
   const GList *iter;
 	
@@ -313,9 +314,9 @@ void o_select_box_search(GSCHEM_TOPLEVEL *w_current)
   }
 
   /* if there were no objects to be found in select box, count will be */
-  /* zero, and you need to deselect anything remaining (unless the shift */
-  /* key was pressed */
-  if (count == 0 && !SHIFTKEY) {
+  /* zero, and you need to deselect anything remaining (except when the */
+  /* shift or control keys are pressed) */
+  if (count == 0 && !SHIFTKEY && !CONTROLKEY) {
     o_select_unselect_all (w_current);
   }
   i_update_menus(w_current);

commit 97bea3a73c9c8d25d54454ea28a942b9c9c38c57
Author: Nathan Schulte <nmschulte@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Fix bug with invert selection and attributes
    
    This fixes a bug that causes attributes to be left unselected when
    selected in the same select box as their parent object.
    
    Closes-bug: lp-912475

diff --git a/gschem/src/o_select.c b/gschem/src/o_select.c
index 71e72e2..db3b92e 100644
--- a/gschem/src/o_select.c
+++ b/gschem/src/o_select.c
@@ -181,7 +181,9 @@ void o_select_object(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current,
     o_attrib_deselect_invisible (w_current,
                                  toplevel->page_current->selection_list,
                                  o_current);
-  } else {
+  /* Don't select attributes if the type is MULTIPLE, as this causes
+   * issues with invert selection (CONTROLKEY pressed). */
+  } else if( type != MULTIPLE) {
     o_attrib_add_selected (w_current, toplevel->page_current->selection_list,
                            o_current);
   }




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