X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Frenderers%2Fwidget%2Fdisptext.c;h=d3abdea148325251958ecb82568b8e9029a08200;hb=ae4f74ae1303ff2ef59d0885606f607e529c5ca0;hp=590945f54ffe28deca60f139c31ee91501d86fe8;hpb=dd2491a82880ed9b01b5d66b1814d271921797a4;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 590945f5..d3abdea1 100644 --- a/Usermode/Applications/axwin3_src/WM/renderers/widget/disptext.c +++ b/Usermode/Applications/axwin3_src/WM/renderers/widget/disptext.c @@ -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,19 +28,13 @@ 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; - if(Element->Parent && (Element->Parent->Flags & ELEFLAG_VERTICAL)) { - Element->MinCross = w; - Element->MinWith = h; - } - else { - Element->MinWith = w; - Element->MinCross = h; - } + Element->MinW = w; + Element->MinH = h; Widget_UpdateMinDims(Element->Parent); }