Commit bb7bd71e authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'more-cosmetic-fixes'

parents 7beef048 c9a410a7
......@@ -320,9 +320,10 @@ text {
//cursor: default;
}
/* not sure if this is still needed */
/* not sure if this is still needed...
updated the coloring just in case */
.selected_border {
stroke: blue;
stroke: #e87216;
stroke-dasharray: none;
stroke-width: 1;
}
......@@ -399,6 +400,12 @@ text {
stroke-dasharray: 3 2;
}
/* ico@vt.edu: added selected border coloring
in edit mode only */
#patchsvg.editmode .comment.selected .border {
stroke: #e87216;
}
/* A little hack for special case of [cnv].
All other iemguis have a black border, but
[cnv] sets its selection rectangle to the
......@@ -426,14 +433,17 @@ text {
in plain English:
This lets us highlight an object's border, unless it is inside a gop
canvas.
ico@vt.edu added selection highlight only if we are in editmode
*/
:not(.gop).selected .border {
#patchsvg.editmode :not(.gop).selected .border {
stroke: #e87216;
display: inline;
}
/* text inside selected objects */
:not(.gop).selected text {
/* text inside selected objects
ico@vt.edu added selection highlight only if we are in editmode */
#patchsvg.editmode :not(.gop).selected text {
fill: #e87216;
}
......
......@@ -332,8 +332,7 @@ var canvas_events = (function() {
pdgui.keydown(name, evt);
// prevent the default behavior of scrolling
// on arrow keys in editmode
if (document.querySelector("#patchsvg")
.classList.contains("editmode")) {
if (document.querySelector("#patchsvg")) {
if ([32, 37, 38, 39, 40].indexOf(evt.keyCode) > -1) {
evt.preventDefault();
}
......
......@@ -5093,6 +5093,7 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
{
gotkeysym = av[1].a_w.w_symbol;
//fprintf(stderr,"gotkeysym=%s\n", gotkeysym->s_name);
//post("key: %d %s", keynum, gotkeysym->s_name);
}
else if (av[1].a_type == A_FLOAT)
{
......@@ -5282,7 +5283,12 @@ void canvas_key(t_canvas *x, t_symbol *s, int ac, t_atom *av)
{
//fprintf(stderr,"ctrl\n");
glob_ctrl = down;
if (x->gl_edit && x->gl_editor->e_onmotion == MA_NONE)
//post("glob_ctrl=%d", down);
/* ico@vt.edu: commenting MA_NONE part as that prevents the patch
from assuming editmode after it has had an object added via
a ctrl+(1-5) shortcut while not in edit mode
*/
if (x->gl_edit /*&& x->gl_editor->e_onmotion == MA_NONE*/)
{
canvas_setcursor(x, down ?
CURSOR_RUNMODE_NOTHING : CURSOR_EDITMODE_NOTHING);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment