Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jonathan Wilkes
purr-data
Commits
44227f1d
Commit
44227f1d
authored
Aug 17, 2014
by
Ivica Bukvic
Browse files
*fixed regressions in g_number (hopefully the last of them), and g_mycanvas
*improved g_all_guis.c and detection/drawing of handles
parent
2a00c135
Changes
2
Hide whitespace changes
Inline
Side-by-side
pd/src/g_all_guis.c
View file @
44227f1d
...
...
@@ -27,6 +27,7 @@ int iemgui_color_hex[] = {
int
iemgui_clip_size
(
int
size
)
{
return
maxi
(
size
,
IEM_GUI_MINSIZE
);}
int
iemgui_clip_font
(
int
size
)
{
return
maxi
(
size
,
IEM_FONT_MINSIZE
);}
static
void
scalehandle_check_and_redraw
(
t_iemgui
*
x
);
static
int
iemgui_modulo_color
(
int
col
)
{
...
...
@@ -425,6 +426,7 @@ void iemgui_shouldvis(t_iemgui *x, int mode)
}
//fprintf(stderr,"draw move x->x_w=%d\n", x->x_w);
x
->
x_draw
(
x
,
x
->
x_glist
,
mode
);
scalehandle_check_and_redraw
(
x
);
canvas_fixlinesfor
(
glist_getcanvas
(
x
->
x_glist
),
(
t_text
*
)
x
);
}
else
if
(
x
->
x_vis
)
...
...
@@ -862,6 +864,15 @@ void iemgui__clickhook3(t_scalehandle *sh, int newstate) {
sh
->
h_dragon
=
newstate
;
}
// function for updating of handles on iemgui objects
// we don't need glist_getcanvas() because handles are only
// drawn when object is selected on its canvas (instead of GOP)
static
void
scalehandle_check_and_redraw
(
t_iemgui
*
x
)
{
if
(
x
->
x_selected
==
x
->
x_glist
)
scalehandle_draw_select2
(
x
,
x
->
x_glist
);
}
//----------------------------------------------------------------
// IEMGUI refactor (by Mathieu)
...
...
@@ -900,7 +911,7 @@ void iemgui_label_draw_config(t_iemgui *x, t_glist *canvas) {
"-fill #%6.6x -text {%s}
\n
"
,
canvas
,
x
,
iemgui_font
(
x
),
x
->
x_lcol
,
x
->
x_lab
!=
s_empty
?
x
->
x_lab
->
s_name
:
""
);
if
(
x
->
x_selected
)
if
(
x
->
x_selected
==
canvas
&&
x
->
x_glist
==
canvas
)
{
t_scalehandle
*
lh
=
(
t_scalehandle
*
)(
x
->
x_lhandle
);
if
(
x
->
x_lab
==
s_empty
)
...
...
pd/src/g_mycanvas.c
View file @
44227f1d
...
...
@@ -207,9 +207,9 @@ static void my_canvas_get_pos(t_my_canvas *x)
static
void
my_canvas_dialog
(
t_my_canvas
*
x
,
t_symbol
*
s
,
int
argc
,
t_atom
*
argv
)
{
printf
(
"cnv_dialog: selected=%d
\n
"
,
x
->
x_gui
.
x_selected
);
//
printf("cnv_dialog: selected=%d\n",x->x_gui.x_selected);
canvas_apply_setundo
(
x
->
x_gui
.
x_glist
,
(
t_gobj
*
)
x
);
printf
(
"cnv_dialog: selected=%d
\n
"
,
x
->
x_gui
.
x_selected
);
//
printf("cnv_dialog: selected=%d\n",x->x_gui.x_selected);
x
->
x_gui
.
x_h
=
x
->
x_gui
.
x_w
=
maxi
(
atom_getintarg
(
0
,
argc
,
argv
),
1
);
x
->
x_vis_w
=
maxi
(
atom_getintarg
(
2
,
argc
,
argv
),
1
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment