From f8acfc41789acd545bb14e8a293c93f18b9bc168 Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Sat, 19 May 2012 21:15:15 -0400
Subject: [PATCH] Finished fixing inconsistency from the iemgui and non-gui
fonts. This will break font appearance in older patches but looking forward
will make things a lot more consistent. This is in part backported from the
0.43 branch.
---
src/g_bang.c | 6 +++---
src/g_hdial.c | 6 +++---
src/g_hslider.c | 6 +++---
src/g_mycanvas.c | 4 ++--
src/g_numbox.c | 10 +++++-----
src/g_toggle.c | 6 +++---
src/g_vdial.c | 6 +++---
src/g_vslider.c | 6 +++---
src/g_vumeter.c | 22 +++++++++++-----------
9 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/g_bang.c b/src/g_bang.c
index 55fd91f15..018ae116d 100644
--- a/src/g_bang.c
+++ b/src/g_bang.c
@@ -81,7 +81,7 @@ void bng_draw_new(t_bng *x, t_glist *glist)
xpos + x->x_gui.x_w-1, ypos + x->x_gui.x_h-1,
x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol, x, x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxLABEL %lxBNG text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxLABEL %lxBNG text}\n",
canvas, xpos+x->x_gui.x_ldx,
ypos+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
@@ -182,11 +182,11 @@ void bng_draw_config(t_bng* x, t_glist* glist)
*/
if (x->x_gui.x_fsf.x_selected)
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill $select_color -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
else
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill #%6.6x -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/src/g_hdial.c b/src/g_hdial.c
index 332393241..6b9870708 100644
--- a/src/g_hdial.c
+++ b/src/g_hdial.c
@@ -99,7 +99,7 @@ void hradio_draw_new(t_hradio *x, t_glist *glist)
x->x_drawn = x->x_on;
}
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxLABEL %lxHRDO text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxLABEL %lxHRDO text}\n",
canvas, xx11b+x->x_gui.x_ldx, yy11+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
@@ -205,11 +205,11 @@ void hradio_draw_config(t_hradio* x, t_glist* glist)
*/
if (x->x_gui.x_fsf.x_selected)
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill $select_color -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
else
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill #%6.6x -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/src/g_hslider.c b/src/g_hslider.c
index e0cb9618b..37561b1ad 100644
--- a/src/g_hslider.c
+++ b/src/g_hslider.c
@@ -104,7 +104,7 @@ static void hslider_draw_new(t_hslider *x, t_glist *glist)
canvas, r, ypos+2, r,
ypos + x->x_gui.x_h-1, x->x_gui.x_fcol, x, x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxLABEL %lxHSLDR text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxLABEL %lxHSLDR text}\n",
canvas, xpos+x->x_gui.x_ldx,
ypos+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
@@ -205,11 +205,11 @@ static void hslider_draw_config(t_hslider* x,t_glist* glist)
*/
if (x->x_gui.x_fsf.x_selected)
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill $select_color -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
else
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill #%6.6x -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/src/g_mycanvas.c b/src/g_mycanvas.c
index 16becf6ed..5f3b8f53c 100644
--- a/src/g_mycanvas.c
+++ b/src/g_mycanvas.c
@@ -58,7 +58,7 @@ void my_canvas_draw_new(t_my_canvas *x, t_glist *glist)
xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
x->x_gui.x_bcol, x, x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxLABEL %lxMYCNV text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxLABEL %lxMYCNV text}\n",
canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
@@ -126,7 +126,7 @@ void my_canvas_draw_config(t_my_canvas* x, t_glist* glist)
else
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x,
x->x_gui.x_bcol);
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill #%6.6x -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/src/g_numbox.c b/src/g_numbox.c
index 555d6f63d..a229ea696 100644
--- a/src/g_numbox.c
+++ b/src/g_numbox.c
@@ -229,14 +229,14 @@ static void my_numbox_draw_new(t_my_numbox *x, t_glist *glist)
xpos, ypos + x->x_gui.x_h,
x->x_gui.x_fcol, x, x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxLABEL %lxNUM text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxLABEL %lxNUM text}\n",
canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol, x, x);
my_numbox_ftoa(x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxNUMBER %lxNUM noscroll text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxNUMBER %lxNUM noscroll text}\n",
canvas, xpos+half+2, ypos+half+d,
x->x_buf, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_fcol, x, x);
@@ -349,7 +349,7 @@ static void my_numbox_draw_config(t_my_numbox* x,t_glist* glist)
*/
if (x->x_gui.x_fsf.x_selected) {
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill $select_color -text {%s} \n .x%lx.c itemconfigure %lxNUMBER -font {{%s} %d %s} -fill $select_color \n .x%lx.c itemconfigure %lxBASE2 -fill $select_color\n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n .x%lx.c itemconfigure %lxNUMBER -font {{%s} -%d %s} -fill $select_color \n .x%lx.c itemconfigure %lxBASE2 -fill $select_color\n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
@@ -362,7 +362,7 @@ static void my_numbox_draw_config(t_my_numbox* x,t_glist* glist)
*/
}
else {
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n .x%lx.c itemconfigure %lxNUMBER -font {{%s} %d %s} -fill #%6.6x \n .x%lx.c itemconfigure %lxBASE2 -fill #%6.6x\n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill #%6.6x -text {%s} \n .x%lx.c itemconfigure %lxNUMBER -font {{%s} -%d %s} -fill #%6.6x \n .x%lx.c itemconfigure %lxBASE2 -fill #%6.6x\n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
@@ -1145,7 +1145,7 @@ static void *my_numbox_new(t_symbol *s, int argc, t_atom *argv)
int bflcol[]={-262144, -1, -1};
int w=5, h=14;
int lilo=0, f=0, ldx=0, ldy=-8;
- int fs=11;
+ int fs=10;
int log_height=256;
double min=-1.0e+37, max=1.0e+37,v=0.0;
char str[144];
diff --git a/src/g_toggle.c b/src/g_toggle.c
index ffc117864..3db86241a 100644
--- a/src/g_toggle.c
+++ b/src/g_toggle.c
@@ -89,7 +89,7 @@ void toggle_draw_new(t_toggle *x, t_glist *glist)
canvas, xx+w+1, yy + x->x_gui.x_h-w-1, xx + x->x_gui.x_w-w, yy+w, w,
(x->x_on!=0.0)?x->x_gui.x_fcol:x->x_gui.x_bcol, x, x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxLABEL %lxTGL text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxLABEL %lxTGL text}\n",
canvas, xx+x->x_gui.x_ldx,
yy+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
@@ -193,12 +193,12 @@ void toggle_draw_config(t_toggle* x, t_glist* glist)
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
*/
if (x->x_gui.x_fsf.x_selected) {
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill $select_color -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
}
else {
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill #%6.6x -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/src/g_vdial.c b/src/g_vdial.c
index bcdcb5da6..f460c8e13 100644
--- a/src/g_vdial.c
+++ b/src/g_vdial.c
@@ -98,7 +98,7 @@ void vradio_draw_new(t_vradio *x, t_glist *glist)
x->x_drawn = x->x_on;
}
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxLABEL %lxVRDO text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxLABEL %lxVRDO text}\n",
canvas, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
@@ -204,11 +204,11 @@ void vradio_draw_config(t_vradio* x, t_glist* glist)
*/
if (x->x_gui.x_fsf.x_selected)
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill $select_color -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
else
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill #%6.6x -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/src/g_vslider.c b/src/g_vslider.c
index 2d03bbb23..8e9265cb1 100644
--- a/src/g_vslider.c
+++ b/src/g_vslider.c
@@ -87,7 +87,7 @@ static void vslider_draw_new(t_vslider *x, t_glist *glist)
canvas, xpos+2, r,
xpos + x->x_gui.x_w-1, r, x->x_gui.x_fcol, x, x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxLABEL %lxVSLDR text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxLABEL %lxVSLDR text}\n",
canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
@@ -191,11 +191,11 @@ static void vslider_draw_config(t_vslider* x,t_glist* glist)
*/
if (x->x_gui.x_fsf.x_selected)
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill $select_color -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
else
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill #%6.6x -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/src/g_vumeter.c b/src/g_vumeter.c
index 1df8a5436..8e76135ee 100644
--- a/src/g_vumeter.c
+++ b/src/g_vumeter.c
@@ -143,7 +143,7 @@ static void vu_draw_new(t_vu *x, t_glist *glist)
canvas, quad1, yyy, quad3, yyy, x->x_led_size, iemgui_color_hex[led_col], x, i, x);
if(((i+2)&3) && (x->x_scale))
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxSCALE%d %lxVU text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxSCALE%d %lxVU text}\n",
canvas, end, yyy+k3, iemgui_vu_scale_str[i],
x->x_gui.x_font, x->x_gui.x_fontsize,
sys_fontweight, x->x_gui.x_lcol, x, i, x);
@@ -153,7 +153,7 @@ static void vu_draw_new(t_vu *x, t_glist *glist)
i=IEM_VU_STEPS+1;
yyy = k4 + k1*(k2-i);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxSCALE%d %lxVU text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxSCALE%d %lxVU text}\n",
canvas, end, yyy+k3, iemgui_vu_scale_str[i], x->x_gui.x_font,
x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol, x, i, x);
@@ -165,7 +165,7 @@ static void vu_draw_new(t_vu *x, t_glist *glist)
canvas, mid, ypos+10,
mid, ypos+10, x->x_led_size, x->x_gui.x_bcol, x, x);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxLABEL %lxVU text}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxLABEL %lxVU text}\n",
canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
@@ -343,11 +343,11 @@ static void vu_draw_config(t_vu* x, t_glist* glist)
x->x_led_size);
if(((i+2)&3) && (x->x_scale))
if (x->x_gui.x_fsf.x_selected)
- sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} %d %s} -fill $select_color\n",
+ sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} -%d %s} -fill $select_color\n",
canvas, x, i, iemgui_vu_scale_str[i], x->x_gui.x_font,
x->x_gui.x_fontsize, sys_fontweight);
else
- sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} %d %s} -fill #%6.6x\n",
+ sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} -%d %s} -fill #%6.6x\n",
canvas, x, i, iemgui_vu_scale_str[i], x->x_gui.x_font,
x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol);
@@ -356,21 +356,21 @@ static void vu_draw_config(t_vu* x, t_glist* glist)
{
i=IEM_VU_STEPS+1;
if (x->x_gui.x_fsf.x_selected)
- sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} %d %s} -fill $select_color\n",
+ sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} -%d %s} -fill $select_color\n",
canvas, x, i, iemgui_vu_scale_str[i], x->x_gui.x_font,
x->x_gui.x_fontsize, sys_fontweight);
else
- sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} %d %s} -fill #%6.6x\n",
+ sys_vgui(".x%lx.c itemconfigure %lxSCALE%d -text {%s} -font {{%s} -%d %s} -fill #%6.6x\n",
canvas, x, i, iemgui_vu_scale_str[i], x->x_gui.x_font,
x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol);
}
if (x->x_gui.x_fsf.x_selected)
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill $select_color -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
else
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} %d %s} -fill #%6.6x -text {%s} \n",
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill #%6.6x -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
@@ -834,7 +834,7 @@ static void vu_scale(t_vu *x, t_floatarg fscale)
yyy = k4 + k1*(k2-i);
if((i+2)&3)
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxSCALE%d %lxVU}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxSCALE%d %lxVU}\n",
canvas, end, yyy+k3, iemgui_vu_scale_str[i],
x->x_gui.x_font, x->x_gui.x_fontsize,
sys_fontweight, x->x_gui.x_lcol, x, i, x);
@@ -842,7 +842,7 @@ static void vu_scale(t_vu *x, t_floatarg fscale)
i=IEM_VU_STEPS+1;
yyy = k4 + k1*(k2-i);
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} %d %s} -fill #%6.6x -tags {%lxSCALE%d %lxVU}\n",
+ -font {{%s} -%d %s} -fill #%6.6x -tags {%lxSCALE%d %lxVU}\n",
canvas, end, yyy+k3, iemgui_vu_scale_str[i],
x->x_gui.x_font, x->x_gui.x_fontsize,
sys_fontweight, x->x_gui.x_lcol, x, i, x);
--
GitLab