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

change function name for consistency

parent e01b09c3
...@@ -2171,7 +2171,7 @@ function gui_text_new(canvasname, myname, type, isselected, x, y, text, font) { ...@@ -2171,7 +2171,7 @@ function gui_text_new(canvasname, myname, type, isselected, x, y, text, font) {
} }
if (isselected) { if (isselected) {
gui_text_select(canvasname, myname); gui_gobj_select(canvasname, myname);
} }
} }
...@@ -2214,7 +2214,7 @@ function gui_text_redraw_border(cid, tag, x1, y1, x2, y2) { ...@@ -2214,7 +2214,7 @@ function gui_text_redraw_border(cid, tag, x1, y1, x2, y2) {
} }
} }
function gui_text_select(cid, tag) { function gui_gobj_select(cid, tag) {
var g = get_gobj(cid, tag); var g = get_gobj(cid, tag);
// var b = get_item(cid, tag + 'border'); // var b = get_item(cid, tag + 'border');
if (g !== null) { if (g !== null) {
...@@ -2228,7 +2228,7 @@ function gui_text_select(cid, tag) { ...@@ -2228,7 +2228,7 @@ function gui_text_select(cid, tag) {
// } // }
} }
function gui_text_deselect(cid, tag) { function gui_gobj_deselect(cid, tag) {
// gui_post("deselecting text with tag..." + tag); // gui_post("deselecting text with tag..." + tag);
var gobj = get_gobj(cid, tag) var gobj = get_gobj(cid, tag)
if (gobj !== null) { if (gobj !== null) {
......
...@@ -51,16 +51,17 @@ Everything else: (A [x] means we've fixed it) ...@@ -51,16 +51,17 @@ Everything else: (A [x] means we've fixed it)
[x] "Save As" on an overwrite doesn't seem to clear the dirty flag [x] "Save As" on an overwrite doesn't seem to clear the dirty flag
[ ] figure out why there is a "pd_opendir" global var [ ] figure out why there is a "pd_opendir" global var
[ ] pass k12 mode arg [ ] pass k12 mode arg
[ ] implement recent files (using Pd's prefs loading mechanism instead of reimplementing gui prefs) [ ] implement recent files (using Pd's prefs loading mechanism instead of
reimplementing gui prefs)
[ ] implement verifyquit [ ] implement verifyquit
[ ] save and saveas dialogs aren't defaulting to the present working directory [ ] save and saveas dialogs aren't defaulting to the present working directory
[ ] implement automatic scrollbars and svg canvas resizing [x] implement automatic scrollbars and svg canvas resizing
[ ] add 'x' type to gui_vmess for saving canvas names, etc., as hex values [x] add 'x' type to gui_vmess for saving canvas names, etc., as hex values
[x] destroy (or, more likely, hide) selection rectangle when not needed [x] destroy (or, more likely, hide) selection rectangle when not needed
[ ] change gui_text_select to gui_gobj_select [ ] change gui_text_select to gui_gobj_select
[ ] make it possible to have the inner cells of hradio change color with the selection, [ ] make it possible to have the inner cells of hradio change color with the
as the border currently does. Tk just uses the non-hierarchical tags and appends the word selection, as the border currently does. Tk just uses the non-hierarchical
"BASE". (Maybe use an inner <g> to do this.) tags and appends the word "BASE". (Maybe use an inner <g> to do this.)
[x] make mycnv use its own selection logic [x] make mycnv use its own selection logic
[ ] abstract away appendChild [ ] abstract away appendChild
[ ] font-size should be set as css property for a class of text, rather than per each gobj in svg [ ] font-size should be set as css property for a class of text, rather than per each gobj in svg
......
...@@ -959,12 +959,12 @@ void iemgui_tag_selected(t_iemgui *x) { ...@@ -959,12 +959,12 @@ void iemgui_tag_selected(t_iemgui *x) {
if(x->x_selected) if(x->x_selected)
{ {
//sys_vgui(".x%lx.c addtag selected withtag x%lx\n", canvas, x); //sys_vgui(".x%lx.c addtag selected withtag x%lx\n", canvas, x);
gui_vmess("gui_text_select", "xx", canvas, x); gui_vmess("gui_gobj_select", "xx", canvas, x);
} }
else else
{ {
//sys_vgui(".x%lx.c dtag x%lx selected\n", canvas, x); //sys_vgui(".x%lx.c dtag x%lx selected\n", canvas, x);
gui_vmess("gui_text_deselect", "xx", canvas, x); gui_vmess("gui_gobj_deselect", "xx", canvas, x);
} }
} }
......
...@@ -1588,7 +1588,7 @@ static void garray_doredraw(t_gobj *client, t_glist *glist) ...@@ -1588,7 +1588,7 @@ static void garray_doredraw(t_gobj *client, t_glist *glist)
t_scalar *sc = x->x_scalar; t_scalar *sc = x->x_scalar;
char tagbuf[MAXPDSTRING]; char tagbuf[MAXPDSTRING];
sprintf(tagbuf, "scalar%lx", (long unsigned int)sc->sc_vec); sprintf(tagbuf, "scalar%lx", (long unsigned int)sc->sc_vec);
gui_vmess("gui_text_select", "xs", gui_vmess("gui_gobj_select", "xs",
glist_getcanvas(glist), tagbuf); glist_getcanvas(glist), tagbuf);
} }
} }
......
...@@ -1505,10 +1505,10 @@ static void graph_select(t_gobj *z, t_glist *glist, int state) ...@@ -1505,10 +1505,10 @@ static void graph_select(t_gobj *z, t_glist *glist, int state)
// (state? "$pd_colors(selection)" : "$pd_colors(graph_border)"), // (state? "$pd_colors(selection)" : "$pd_colors(graph_border)"),
// (state? "$pd_colors(selection)" : "$pd_colors(graph_border)")); // (state? "$pd_colors(selection)" : "$pd_colors(graph_border)"));
if (state) if (state)
gui_vmess("gui_text_select", "xs", gui_vmess("gui_gobj_select", "xs",
canvas, rtext_gettag(y)); canvas, rtext_gettag(y));
else else
gui_vmess("gui_text_deselect", "xs", gui_vmess("gui_gobj_deselect", "xs",
canvas, rtext_gettag(y)); canvas, rtext_gettag(y));
} }
......
...@@ -527,7 +527,7 @@ void scalar_select(t_gobj *z, t_glist *owner, int state) ...@@ -527,7 +527,7 @@ void scalar_select(t_gobj *z, t_glist *owner, int state)
// glist_getcanvas(owner), x); // glist_getcanvas(owner), x);
//sys_vgui(".x%lx.c addtag scalar_selected withtag {.scalar%lx}\n", //sys_vgui(".x%lx.c addtag scalar_selected withtag {.scalar%lx}\n",
// glist_getcanvas(owner), x->sc_vec); // glist_getcanvas(owner), x->sc_vec);
gui_vmess("gui_text_select", "xs", gui_vmess("gui_gobj_select", "xs",
glist_getcanvas(owner), tagbuf); glist_getcanvas(owner), tagbuf);
} }
else else
...@@ -537,7 +537,7 @@ void scalar_select(t_gobj *z, t_glist *owner, int state) ...@@ -537,7 +537,7 @@ void scalar_select(t_gobj *z, t_glist *owner, int state)
// glist_getcanvas(owner), x); // glist_getcanvas(owner), x);
//sys_vgui(".x%lx.c dtag .scalar%lx scalar_selected\n", //sys_vgui(".x%lx.c dtag .scalar%lx scalar_selected\n",
// glist_getcanvas(owner), x->sc_vec); // glist_getcanvas(owner), x->sc_vec);
gui_vmess("gui_text_deselect", "xs", gui_vmess("gui_gobj_deselect", "xs",
glist_getcanvas(owner), tagbuf); glist_getcanvas(owner), tagbuf);
} }
//sys_vgui("pdtk_select_all_gop_widgets .x%lx %lx %d\n", //sys_vgui("pdtk_select_all_gop_widgets .x%lx %lx %d\n",
......
...@@ -1631,7 +1631,7 @@ static void text_select(t_gobj *z, t_glist *glist, int state) ...@@ -1631,7 +1631,7 @@ static void text_select(t_gobj *z, t_glist *glist, int state)
} }
//sys_vgui(".x%lx.c addtag selected withtag %sR \n", //sys_vgui(".x%lx.c addtag selected withtag %sR \n",
// glist_getcanvas(glist), rtext_gettag(y)); // glist_getcanvas(glist), rtext_gettag(y));
gui_vmess("gui_text_select", "xs", gui_vmess("gui_gobj_select", "xs",
glist_getcanvas(glist), rtext_gettag(y)); glist_getcanvas(glist), rtext_gettag(y));
if (pd_class(&x->te_pd) == text_class && if (pd_class(&x->te_pd) == text_class &&
...@@ -1671,7 +1671,7 @@ static void text_select(t_gobj *z, t_glist *glist, int state) ...@@ -1671,7 +1671,7 @@ static void text_select(t_gobj *z, t_glist *glist, int state)
} }
//sys_vgui(".x%lx.c dtag %sR selected\n", //sys_vgui(".x%lx.c dtag %sR selected\n",
// glist_getcanvas(glist), rtext_gettag(y)); // glist_getcanvas(glist), rtext_gettag(y));
gui_vmess("gui_text_deselect", "xs", gui_vmess("gui_gobj_deselect", "xs",
glist_getcanvas(glist), glist_getcanvas(glist),
rtext_gettag(y)); rtext_gettag(y));
......
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