Commit 8b187ccf authored by Jonathan Wilkes's avatar Jonathan Wilkes

Merge branch 'port-drawtext-squashed'

parents 1e02502c 49d94d17
......@@ -748,12 +748,12 @@ static void scalar_displace_withtag(t_gobj *z, t_glist *glist, int dx, int dy)
t_gobj *y;
t_canvas *templatecanvas = template_findcanvas(template);
for (y = templatecanvas->gl_list; y; y = y->g_next)
{
t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd);
if (!wb) continue;
(*wb->w_parentdisplacefn)(y, glist, x->sc_vec, template,
basex, basey, dx, dy);
}
{
t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd);
if (!wb) continue;
(*wb->w_parentdisplacefn)(y, glist, x->sc_vec, template,
basex, basey, dx, dy);
}
}
*/
......
This diff is collapsed.
#N struct drawtext-default-arg-test float x float y text a;
#N canvas 6 89 620 461 12;
#N canvas 363 260 450 323 \$0-test 0;
#X scalar drawtext-default-arg-test 89 55 \; \;;
#X restore 251 339 pd \$0-test;
#X obj 157 214 send pd-\$0-test;
#X msg 157 179 vis 1;
#X obj 41 48 bng 39 250 50 0 empty empty empty 17 7 0 10 -262144 -1
-1;
#X obj 41 143 trigger bang bang;
#X obj 183 18 struct drawtext-default-arg-test float x float y text
a;
#X obj 282 214 drawnumber;
#X text 212 246 drawnumber with no args shouldn't report a type-checking
error;
#X text 155 52 drawtext/drawsymbol/drawtext with no args should just
silently fail to display anything. When clicking the bng to display
the subject should not generate any errors.;
#X connect 2 0 1 0;
#X connect 3 0 4 0;
#X connect 4 1 2 0;
#N struct drawtext-selector-test float x float y text a;
#N canvas 3 60 620 461 12;
#X obj 183 18 struct drawtext-selector-test float x float y text a
;
#X obj 392 182 drawnumber a;
#N canvas 143 190 450 300 \$0-test 0;
#X scalar drawtext-selector-test 80 59 \; \;;
#X restore 251 339 pd \$0-test;
#X obj 157 214 send pd-\$0-test;
#X text 322 214 drawnumber can't display a text field;
#X msg 157 179 vis 1;
#X obj 41 48 bng 39 250 50 0 empty empty empty 17 7 0 10 -262144 -1
-1;
#X obj 41 143 trigger bang bang;
#X text 155 52 drawtext/drawsymbol/drawtext should report an error
when the field type doesn't match the required type. After pressing
the button to open the subpatch you should see the error reported to
the console.;
#X connect 5 0 3 0;
#X connect 6 0 7 0;
#X connect 7 1 5 0;
......@@ -50,6 +50,7 @@ is handy for some binbuf tests.;
#X obj 145 773 rtest makefilename_float;
#X obj 145 824 rtest makefilename_symbol;
#X obj 145 875 rtest makefilename_bang;
#X obj 145 926 rtest drawtext-typecheck;
#X connect 0 0 1 0;
#X connect 1 0 7 0;
#X connect 1 1 29 0;
......@@ -86,3 +87,4 @@ is handy for some binbuf tests.;
#X connect 40 0 41 0;
#X connect 41 0 42 0;
#X connect 42 0 43 0;
#X connect 43 0 44 0;
#N canvas 6 89 620 375 12;
#X obj 41 8 inlet;
#X obj 41 304 outlet;
#X obj 196 117 ./utils/creation-test;
#X obj 157 60 unpost;
#X msg 196 88 drawnumber 12;
#X obj 41 33 trigger bang bang;
#X msg 213 13 bang;
#X obj 41 171 f;
#X obj 41 196 list append drawtext/drawsymbol/drawnumber should refuse
to create with a float given for the field name;
#X obj 196 142 == 0;
#X connect 0 0 5 0;
#X connect 2 0 9 0;
#X connect 3 1 4 0;
#X connect 4 0 2 0;
#X connect 5 0 7 0;
#X connect 5 1 3 0;
#X connect 6 0 5 0;
#X connect 7 0 8 0;
#X connect 8 0 1 0;
#X connect 9 0 7 1;
#N canvas 314 60 683 597 12;
#X text 97 22 Simple abstraction to test object creation;
#N canvas 82 171 450 346 \$0-test 1;
#X obj 200 20 receive 1004-in;
#X obj 200 60 canvasinfo;
#X obj 200 100 send 1004-out;
#X text 41 40 hello;
#X connect 0 0 1 0;
#X connect 1 0 2 0;
#X restore 28 318 pd \$0-test;
#X obj 28 22 inlet;
#X obj 71 151 list prepend obj 0 0;
#X obj 71 176 list trim;
#X obj 71 206 send pd-\$0-test;
#X obj 28 97 trigger anything anything bang;
#X obj 28 236 list prepend find;
#X obj 235 124 f \$0;
#X msg 262 93 bang;
#X obj 28 291 send \$0-in;
#X obj 28 345 r \$0-out;
#X msg 235 151 clear \, obj 200 20 receive \$1-in \, obj 200 60 canvasinfo
\, obj 200 100 send \$1-out \, connect 0 0 1 0 \, connect 1 0 2 0;
#X msg 28 370 list \$1;
#X obj 28 395 t b a;
#X obj 28 447 objectinfo;
#X msg 28 420 class;
#X obj 28 261 list trim;
#X text 63 53 for everything except receive \, send \, and canvasinfo
\, or comments;
#X obj 28 472 select text;
#X msg 28 497 0;
#X obj 102 497 b;
#X msg 102 522 1;
#X obj 28 559 outlet;
#X connect 2 0 6 0;
#X connect 3 0 4 0;
#X connect 4 0 5 0;
#X connect 6 0 7 0;
#X connect 6 1 3 0;
#X connect 6 2 8 0;
#X connect 7 0 17 0;
#X connect 8 0 12 0;
#X connect 9 0 8 0;
#X connect 11 0 13 0;
#X connect 12 0 5 0;
#X connect 13 0 14 0;
#X connect 14 0 16 0;
#X connect 14 1 15 1;
#X connect 15 0 19 0;
#X connect 16 0 15 0;
#X connect 17 0 10 0;
#X connect 19 0 20 0;
#X connect 19 1 21 0;
#X connect 20 0 23 0;
#X connect 21 0 22 0;
#X connect 22 0 23 0;
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