X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Frenderers%2Fwidget%2Fdisptext.c;h=0882dc8080f5f683d0aa00caa98ac4f6b502c670;hb=32980a36e515d1be2da1c7bf551070d4e972963e;hp=dfdb358067c15ac24582eb3b1d07a95c97f9a4ae;hpb=e62ce4c06895976eeabd6f91803f5a4194ccc902;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin3_src/WM/renderers/widget/disptext.c b/Usermode/Applications/axwin3_src/WM/renderers/widget/disptext.c index dfdb3580..0882dc80 100644 --- a/Usermode/Applications/axwin3_src/WM/renderers/widget/disptext.c +++ b/Usermode/Applications/axwin3_src/WM/renderers/widget/disptext.c @@ -2,8 +2,8 @@ * Acess2 Window Manager v3 * - By John Hodge (thePowersGang) * - * renderer/widget/button.c - * - Button Widget Type + * renderer/widget/disptext.c + * - Label Text */ #include #include "./common.h" @@ -17,7 +17,7 @@ void Widget_DispText_Render(tWindow *Window, tElement *Element) Element->CachedX+1, Element->CachedY+1, Element->CachedW-2, Element->CachedH-2, NULL, TEXT_COLOUR, - Element->Text + Element->Text, -1 ); } @@ -28,7 +28,7 @@ void Widget_DispText_UpdateText(tElement *Element, const char *Text) if(Element->Text) free(Element->Text); Element->Text = strdup(Text); - WM_Render_GetTextDims(NULL, Element->Text, &w, &h); + WM_Render_GetTextDims(NULL, Element->Text, -1, &w, &h); // Apply edge padding w += 2; h += 2; @@ -39,7 +39,7 @@ void Widget_DispText_UpdateText(tElement *Element, const char *Text) Widget_UpdateMinDims(Element->Parent); } -DEFWIDGETTYPE(ELETYPE_TEXT, +DEFWIDGETTYPE(ELETYPE_TEXT, "Text", WIDGETTYPE_FLAG_NOCHILDREN, .Render = Widget_DispText_Render, .UpdateText = Widget_DispText_UpdateText