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
0678e05a
Commit
0678e05a
authored
Oct 08, 2014
by
Ivica Bukvic
Browse files
*fixed regression where iemguis with custom foreground color tainted the border color
parent
294f3a29
Changes
3
Hide whitespace changes
Inline
Side-by-side
pd/src/g_all_guis.c
View file @
0678e05a
...
...
@@ -502,9 +502,8 @@ void iemgui_select(t_gobj *z, t_glist *glist, int selected)
x
->
x_selected
=
canvas
;
else
x
->
x_selected
=
NULL
;
char
fcol
[
8
];
sprintf
(
fcol
,
"#%6.6x"
,
x
->
x_fcol
);
sys_vgui
(
".x%lx.c itemconfigure {x%lx&&border} -stroke %s
\n
"
,
canvas
,
x
,
x
->
x_selected
&&
x
->
x_glist
==
canvas
?
selection_color
:
f
col
);
x
->
x_selected
&&
x
->
x_glist
==
canvas
?
selection_color
:
border_
col
or
);
x
->
x_draw
((
void
*
)
z
,
glist
,
IEM_GUI_DRAW_MODE_SELECT
);
if
(
selected
<
2
)
{
...
...
@@ -1184,6 +1183,7 @@ void g_iemgui_setup (void) {
}
const
char
*
selection_color
=
"$pd_colors(selection)"
;
const
char
*
border_color
=
"$pd_colors(iemgui_border)"
;
#define GET_OUTLET t_outlet *out = x->x_obj.ob_outlet;
/* can't use int o because there's not obj_nth_outlet function */
#define SEND_BY_SYMBOL (iemgui_has_snd(x) && x->x_snd->s_thing && (!chk_putin || x->x_put_in2out))
...
...
pd/src/g_all_guis.h
View file @
0678e05a
...
...
@@ -267,6 +267,7 @@ EXTERN void wb_init(t_widgetbehavior *wb, t_getrectfn gr, t_clickfn cl); // rena
extern
t_symbol
*
s_empty
;
EXTERN
const
char
*
selection_color
;
EXTERN
const
char
*
border_color
;
static
inline
int
iemgui_has_snd
(
t_iemgui
*
x
)
{
return
x
->
x_snd
!=
s_empty
;}
static
inline
int
iemgui_has_rcv
(
t_iemgui
*
x
)
{
return
x
->
x_rcv
!=
s_empty
;}
...
...
pd/src/g_radio.c
View file @
0678e05a
...
...
@@ -44,9 +44,9 @@ void radio_draw_new(t_radio *x, t_glist *glist)
iemgui_base_draw_new
(
&
x
->
x_gui
);
for
(
i
=
0
;
i
<
n
;
i
++
)
if
(
x
->
x_orient
)
{
if
(
i
)
sys_vgui
(
".x%lx.c create p
line
%d %d %d %d "
if
(
i
)
sys_vgui
(
".x%lx.c create p
rect
%d %d %d %d "
"-stroke $pd_colors(iemgui_border) "
"-tags {%lxBASE%d %lxBASE
L
x%lx text iemgui border}
\n
"
,
"-tags {%lxBASE%d %lxBASE x%lx text iemgui border}
\n
"
,
canvas
,
x1
,
yi
,
x1
+
d
,
yi
,
x
,
i
,
x
,
x
);
sys_vgui
(
".x%lx.c create prect %d %d %d %d -fill #%6.6x "
"-stroke #%6.6x -tags {%lxBUT%d x%lx text iemgui}
\n
"
,
...
...
@@ -57,9 +57,9 @@ void radio_draw_new(t_radio *x, t_glist *glist)
yi
+=
d
;
x
->
x_drawn
=
x
->
x_on
;
}
else
{
if
(
i
)
sys_vgui
(
".x%lx.c create p
line
%d %d %d %d "
if
(
i
)
sys_vgui
(
".x%lx.c create p
rect
%d %d %d %d "
"-stroke $pd_colors(iemgui_border) "
"-tags {%lxBASE%d %lxBASE
L
x%lx text iemgui border}
\n
"
,
"-tags {%lxBASE%d %lxBASE x%lx text iemgui border}
\n
"
,
canvas
,
xi
,
y1
,
xi
,
y1
+
d
,
x
,
i
,
x
,
x
);
sys_vgui
(
".x%lx.c create prect %d %d %d %d -fill #%6.6x "
"-stroke #%6.6x -tags {%lxBUT%d x%lx text iemgui}
\n
"
,
...
...
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