gEDA-cvs: pcb.git: branch: master updated (9396377717f7c49cf38d753a35e32d004294b09e)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  9396377717f7c49cf38d753a35e32d004294b09e (commit)
       via  6be2f4a159accc28c04652eb8fd3b0b9467487a6 (commit)
      from  dd80b3287ec84e4884e6bcf29f168f5fcef1aa73 (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
=========

 src/change.c                      |   12 ++++++------
 src/hid/gtk/ghid-layer-selector.c |    5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)


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

commit 9396377717f7c49cf38d753a35e32d004294b09e
Author: Andrew Poelstra <asp11@xxxxxx>
Commit: Andrew Poelstra <asp11@xxxxxx>

    Change change.c to treat text scale as mils

:100644 100644 5d44355... eca110e... M	src/change.c

commit 6be2f4a159accc28c04652eb8fd3b0b9467487a6
Author: Andrew Poelstra <asp11@xxxxxx>
Commit: Andrew Poelstra <asp11@xxxxxx>

    Configure layer selector to only accept left-clicks
    
    Suggested by Kai-Martin Knaak, seconded by me.

:100644 100644 2c5d0e5... dd81dad... M	src/hid/gtk/ghid-layer-selector.c

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

commit 9396377717f7c49cf38d753a35e32d004294b09e
Author: Andrew Poelstra <asp11@xxxxxx>
Commit: Andrew Poelstra <asp11@xxxxxx>

    Change change.c to treat text scale as mils

diff --git a/src/change.c b/src/change.c
index 5d44355..eca110e 100644
--- a/src/change.c
+++ b/src/change.c
@@ -128,8 +128,8 @@ static void *ChangePolyClear (LayerTypePtr, PolygonTypePtr);
 /* ---------------------------------------------------------------------------
  * some local identifiers
  */
-static int Delta;		/* change of size */
-static int Absolute;		/* Absolute size */
+static Coord Delta;		/* change of size */
+static Coord Absolute;		/* Absolute size */
 static char *NewName;		/* new name */
 static ObjectFunctionType ChangeSizeFunctions = {
   ChangeLineSize,
@@ -838,8 +838,8 @@ ChangeArcClearSize (LayerTypePtr Layer, ArcTypePtr Arc)
 static void *
 ChangeTextSize (LayerTypePtr Layer, TextTypePtr Text)
 {
-  int value = (Absolute != 0 ? Text->Scale : 0) +
-              (Absolute != 0 ? Absolute : Delta) * 100 / FONT_CAPHEIGHT;
+  int value = Absolute ? COORD_TO_MIL (Absolute)
+                       : Text->Scale + COORD_TO_MIL (Delta);
 
   if (TEST_FLAG (LOCKFLAG, Text))
     return (NULL);
@@ -914,8 +914,8 @@ ChangeElementSize (ElementTypePtr Element)
 static void *
 ChangeElementNameSize (ElementTypePtr Element)
 {
-  int value = (Absolute != 0 ? DESCRIPTION_TEXT (Element).Scale : 0) +
-              (Absolute != 0 ? Absolute : Delta) * 100 / FONT_CAPHEIGHT;
+  int value = Absolute ? COORD_TO_MIL (Absolute)
+                  : DESCRIPTION_TEXT (Element).Scale + COORD_TO_MIL (Delta);
 
   if (TEST_FLAG (LOCKFLAG, &Element->Name[0]))
     return (NULL);

commit 6be2f4a159accc28c04652eb8fd3b0b9467487a6
Author: Andrew Poelstra <asp11@xxxxxx>
Commit: Andrew Poelstra <asp11@xxxxxx>

    Configure layer selector to only accept left-clicks
    
    Suggested by Kai-Martin Knaak, seconded by me.

diff --git a/src/hid/gtk/ghid-layer-selector.c b/src/hid/gtk/ghid-layer-selector.c
index 2c5d0e5..dd81dad 100644
--- a/src/hid/gtk/ghid-layer-selector.c
+++ b/src/hid/gtk/ghid-layer-selector.c
@@ -176,6 +176,11 @@ button_press_cb (GHidLayerSelector *ls, GdkEventButton *event)
    *  layer, which will happen if we let this event propagate.  */
   GtkTreeViewColumn *column;
   GtkTreePath *path;
+
+  /* Ignore all but left-clicks */
+  if (event->button != 1)
+    return TRUE;
+
   if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (ls),
                                      event->x, event->y,
                                      &path, &column, NULL, NULL))




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