| selected | color | 0 | generic object selection color
Index: trunk/src/conf_core.h
===================================================================
--- trunk/src/conf_core.h (revision 28367)
+++ trunk/src/conf_core.h (revision 28368)
@@ -159,6 +159,7 @@
struct { /* color */
CFT_COLOR crosshair; /* obsolete - DO NOT USE - kept for compatibility (use appearance/color/cross instead) */
+ CFT_COLOR attached; /* color of the non-layer corsshair-attached objects drawn in XOR (e.g. when padstack or buffer outline before placed; layer-objects like lines and arcs typically onherit the layer color) */
CFT_COLOR drc; /* color of the on-screen drc clearance indication while routing */
CFT_COLOR mark; /* color of the on-screen marks (user placed mark and automatic 'grabbed' mark) */
CFT_COLOR selected; /* generic object selection color */
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c (revision 28367)
+++ trunk/src/crosshair.c (revision 28368)
@@ -293,7 +293,7 @@
pcb_draw_wireframe_line(pcb_crosshair.GC,line.Point1.X, line.Point1.Y,
line.Point2.X, line.Point2.Y,
line.Thickness + 2 * (conf_core.design.bloat + 1), 0);
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
}
break;
}
@@ -315,7 +315,7 @@
pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
arc.Thickness += 2 * (conf_core.design.bloat + 1);
pcb_draw_wireframe_arc(pcb_crosshair.GC, &arc, arc.Thickness);
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
}
break;
}
@@ -358,7 +358,7 @@
pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X,
point2.Y,line->Thickness + 2 * (conf_core.design.bloat + 1), 0);
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
}
}
else {
@@ -413,7 +413,7 @@
pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
arc.Thickness += 2 * (conf_core.design.bloat + 1);
pcb_draw_wireframe_arc(pcb_crosshair.GC, &arc, arc.Thickness);
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
}
/* Get the new arc point positions, calculate the movement deltas and send them
@@ -477,7 +477,7 @@
pcb_render->set_drawing_mode(pcb_gui, PCB_HID_COMP_POSITIVE_XOR, 1, NULL);
}
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
pcb_tool_draw_attached(hidlib);
/* an attached box does not depend on a special mode */
Index: trunk/src/pcb-conf.lht
===================================================================
--- trunk/src/pcb-conf.lht (revision 28367)
+++ trunk/src/pcb-conf.lht (revision 28368)
@@ -163,6 +163,7 @@
background = {#e5e5e5}
cross = {#cdcd00}
mark = {#ff0000}
+ attached = {#ff0000}
drc = {#cdcd00}
selected = {#00ffff}
via = {#707070}
Index: trunk/src/tool_arc.c
===================================================================
--- trunk/src/tool_arc.c (revision 28367)
+++ trunk/src/tool_arc.c (revision 28368)
@@ -147,7 +147,7 @@
if (conf_core.editor.show_drc) {
pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
pcb_xordraw_attached_arc(conf_core.design.line_thickness + 2 * (conf_core.design.bloat + 1));
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
}
}
else {
@@ -166,7 +166,7 @@
pcb_crosshair.X, pcb_crosshair.Y,
pcb_crosshair.X, pcb_crosshair.Y,
conf_core.design.line_thickness + (2 * conf_core.design.bloat), 0);
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
}
}
Index: trunk/src/tool_line.c
===================================================================
--- trunk/src/tool_line.c (revision 28367)
+++ trunk/src/tool_line.c (revision 28368)
@@ -365,7 +365,7 @@
pcb_route_draw(&pcb_crosshair.Route,pcb_crosshair.GC);
if (conf_core.editor.show_drc)
pcb_route_draw_drc(&pcb_crosshair.Route,pcb_crosshair.GC);
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
}
else {
/* Draw a circle (0 length line) to show where the line will be placed */
@@ -383,7 +383,7 @@
pcb_crosshair.X, pcb_crosshair.Y,
pcb_crosshair.X, pcb_crosshair.Y,
conf_core.design.line_thickness + (2 * conf_core.design.bloat), 0);
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
}
}
}
Index: trunk/src/tool_via.c
===================================================================
--- trunk/src/tool_via.c (revision 28367)
+++ trunk/src/tool_via.c (revision 28368)
@@ -100,7 +100,7 @@
/* XXX: Naughty cheat - use the mask to draw DRC clearance! */
pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, conf_core.design.clearance);
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
}
}
Index: trunk/src_plugins/exto_std/line_of_vias.c
===================================================================
--- trunk/src_plugins/exto_std/line_of_vias.c (revision 28367)
+++ trunk/src_plugins/exto_std/line_of_vias.c (revision 28368)
@@ -88,8 +88,8 @@
*ptr1 = &lov->edit.parent.layer;
*ptr2 = &lov->edit;
- *ptr2 = &lov->edit;
- return PCB_OBJ_LINE;
+ *ptr2 = &lov->edit.Point1;
+ return PCB_OBJ_LINE_POINT;
}
Index: trunk/src_plugins/rubberband_orig/rubberband.c
===================================================================
--- trunk/src_plugins/rubberband_orig/rubberband.c (revision 28367)
+++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 28368)
@@ -1197,7 +1197,7 @@
pcb_route_draw_drc(&route, pcb_crosshair.GC);
pcb_route_destroy(&route);
}
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
}
ptr++;
Index: trunk/src_plugins/serpentine/serpentine.c
===================================================================
--- trunk/src_plugins/serpentine/serpentine.c (revision 28367)
+++ trunk/src_plugins/serpentine/serpentine.c (revision 28368)
@@ -97,7 +97,7 @@
const pcb_coord_t x2 = p_info->end.X + nx;
const pcb_coord_t y2 = p_info->end.Y + ny;
- pcb_render->set_color(pcb_crosshair.GC, "#808080" /*pcbhl_conf.appearance.color.cross*/ );
+ pcb_render->set_color(pcb_crosshair.GC, "#808080" /*conf_core.appearance.color.attached*/ );
pcb_render->draw_line(pcb_crosshair.GC, p_info->start.X, p_info->start.Y, p_info->end.X, p_info->end.Y );
pcb_render->draw_line(pcb_crosshair.GC, p_info->start.X, p_info->start.Y, x1, y1 );
pcb_render->draw_line(pcb_crosshair.GC, p_info->end.X, p_info->end.Y, x2, y2 );
|