Changeset 5366

Timestamp:

08/02/09 07:36:21 (4 years ago)

Author:

werner

Message:

• the stem of a vector can now also be selected, but at low priority
• active elements are drawn above inactive ones
• the selected element is always drawn on top

Location:

developers/werner/fped

Files:

• TODO (modified) (1 diff)
• gui_inst.c (modified) (1 diff)
• gui_inst.h (modified) (1 diff)
• inst.c (modified) (3 diffs)

developers/werner/fped/TODO

@@ -18 +18 @@
 
 Style:
-- stack elements (2a): all inactive below all active
-- stack elements (2b): unselected below selected
 - make column of entry field greedily consume all unallocated space
 

developers/werner/fped/gui_inst.c

@@ -141 +141 @@
         d = dist_point(pos, self->u.end)/scale;
         return d > VEC_EYE_R ? -1 : d;
+}
+
+
+/*
+ * The circles at a vector's tip enjoy the highest selection priority. However,
+ * users will probably also expected a click on a nicely exposed stem to work.
+ * So we give it second look after having exhausted all other options.
+ */
+
+unit_type gui_dist_vec_fallback(struct inst *self, struct coord pos,
+    unit_type scale)
+{
+        unit_type d;
+
+        d = dist_line(pos, self->base, self->u.end)/scale;
+        return d > SELECT_R ? -1 : d;
 }
 

developers/werner/fped/gui_inst.h

@@ -32 +32 @@
 
 unit_type gui_dist_vec(struct inst *self, struct coord pos, unit_type scale);
+unit_type gui_dist_vec_fallback(struct inst *self, struct coord pos,
+    unit_type scale);
 unit_type gui_dist_line(struct inst *self, struct coord pos, unit_type scale);
 unit_type gui_dist_rect(struct inst *self, struct coord pos, unit_type scale);

developers/werner/fped/inst.c

@@ -130 +130 @@
         deselect_outside();
         edit_nothing();
+        selected_inst = NULL;
         FOR_INST_PRIOS_DOWN(prio) {
-                selected_inst = NULL;
                 for (inst = insts[prio]; inst; inst = inst->next) {
                         if (!inst->active || !inst->ops->distance)
@@ -141 +141 @@
                         }
                 }
-                if (selected_inst) {
-                        set_path(1);
-                        if (selected_inst->ops->select)
-                                selected_inst->ops->select(selected_inst);
-                        return 1;
+                if (selected_inst)
+                        goto selected;
+        }
+
+        /* give vectors a second chance */
+
+        for (inst = insts[ip_vec]; inst; inst = inst->next) {
+                if (!inst->active)
+                        continue;
+                dist = gui_dist_vec_fallback(inst, pos, ctx->scale);
+                if (dist >= 0 && (!selected_inst || best_dist > dist)) {
+                        selected_inst = inst;
+                        best_dist = dist;
                 }
         }
-        return 0;
+        
+        if (!selected_inst)
+                return 0;
+
+selected:
+        set_path(1);
+        if (selected_inst->ops->select)
+                selected_inst->ops->select(selected_inst);
+        return 1;
 }
 
@@ -616 +632 @@
 
         FOR_INSTS_UP(prio, inst)
-                if (inst->ops->draw)
+                if (!inst->active && inst->ops->draw)
                         inst->ops->draw(inst, ctx);
+        FOR_INSTS_UP(prio, inst)
+                if (inst->active && inst != selected_inst && inst->ops->draw)
+                        inst->ops->draw(inst, ctx);
+        if (selected_inst && selected_inst->ops->draw)
+                selected_inst->ops->draw(selected_inst, ctx);
 }