Usermode/AxWin3 - Clean up unneeded (and silly) log message
[tpg/acess2.git] / Usermode / Applications / axwin3_src / WM / renderers / widget / disptext.c
index 4ea4833..0882dc8 100644 (file)
@@ -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 <common.h>
 #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,24 +28,19 @@ 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);
 }
 
-DEFWIDGETTYPE(ELETYPE_TEXT,
+DEFWIDGETTYPE(ELETYPE_TEXT, "Text",
+       WIDGETTYPE_FLAG_NOCHILDREN,
        .Render = Widget_DispText_Render,
        .UpdateText = Widget_DispText_UpdateText
        );

UCC git Repository :: git.ucc.asn.au