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

fix arg mismatch for gui call to draw drag handle, formatting

parent 7cac18b9
...@@ -692,7 +692,6 @@ extern t_class *my_canvas_class; ...@@ -692,7 +692,6 @@ extern t_class *my_canvas_class;
// but in the case of canvas, the "iemgui" tag is added (it wasn't the case originally) // but in the case of canvas, the "iemgui" tag is added (it wasn't the case originally)
void scalehandle_draw_select(t_scalehandle *h, int px, int py) void scalehandle_draw_select(t_scalehandle *h, int px, int py)
{ {
char tagbuf[MAXPDSTRING];
t_object *x = h->h_master; t_object *x = h->h_master;
t_canvas *canvas=glist_getcanvas(h->h_glist); t_canvas *canvas=glist_getcanvas(h->h_glist);
...@@ -702,9 +701,8 @@ void scalehandle_draw_select(t_scalehandle *h, int px, int py) ...@@ -702,9 +701,8 @@ void scalehandle_draw_select(t_scalehandle *h, int px, int py)
scalehandle_draw_erase(h); scalehandle_draw_erase(h);
if (!h->h_vis) { if (!h->h_vis) {
sprintf(tagbuf, "x%lx", (long unsigned int)x); gui_vmess("gui_iemgui_label_show_drag_handle", "xxiiii",
gui_vmess("gui_iemgui_label_show_drag_handle", "xsiiii", canvas, x, 1, px - sx, py - sy, h->h_scale);
canvas, tagbuf, 1, px - sx, py - sy, h->h_scale);
h->h_vis = 1; h->h_vis = 1;
} }
} }
...@@ -742,8 +740,13 @@ void scalehandle_draw_erase(t_scalehandle *h) ...@@ -742,8 +740,13 @@ void scalehandle_draw_erase(t_scalehandle *h)
{ {
//t_canvas *canvas = glist_getcanvas(h->h_glist); //t_canvas *canvas = glist_getcanvas(h->h_glist);
if (!h->h_vis) return; if (!h->h_vis) return;
gui_vmess("gui_iemgui_label_show_drag_handle", "xxiiiii", gui_vmess("gui_iemgui_label_show_drag_handle", "xxiiii",
h->h_glist, h->h_master, 0, 0, 0, h->h_scale); h->h_glist,
h->h_master,
0,
0,
0,
h->h_scale);
h->h_vis = 0; h->h_vis = 0;
} }
...@@ -1071,7 +1074,7 @@ void iemgui_label_draw_config(t_iemgui *x) ...@@ -1071,7 +1074,7 @@ void iemgui_label_draw_config(t_iemgui *x)
void iemgui_label_draw_select(t_iemgui *x) void iemgui_label_draw_select(t_iemgui *x)
{ {
t_canvas *canvas=glist_getcanvas(x->x_glist); t_canvas *canvas = glist_getcanvas(x->x_glist);
if (x->x_selected == canvas && x->x_glist == canvas) if (x->x_selected == canvas && x->x_glist == canvas)
{ {
gui_vmess("gui_iemgui_label_select", "xxi", gui_vmess("gui_iemgui_label_select", "xxi",
......
...@@ -22,8 +22,8 @@ t_widgetbehavior my_canvas_widgetbehavior; ...@@ -22,8 +22,8 @@ t_widgetbehavior my_canvas_widgetbehavior;
void my_canvas_draw_new(t_my_canvas *x, t_glist *glist) void my_canvas_draw_new(t_my_canvas *x, t_glist *glist)
{ {
t_canvas *canvas=glist_getcanvas(glist); t_canvas *canvas=glist_getcanvas(glist);
int x1=text_xpix(&x->x_gui.x_obj, glist); int x1 = text_xpix(&x->x_gui.x_obj, glist);
int y1=text_ypix(&x->x_gui.x_obj, glist); int y1 = text_ypix(&x->x_gui.x_obj, glist);
char cbuf[8]; char cbuf[8];
sprintf(cbuf, "#%6.6x", x->x_gui.x_bcol); sprintf(cbuf, "#%6.6x", x->x_gui.x_bcol);
......
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