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=4a091def53779923309623aacad46ebed5a7ccc4;hpb=2f16fec349eabb42f5e23ea2b821f149fa6b767e;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 4a091def..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 <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,20 +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);
-	if(Element->Parent && (Element->Parent->Flags & ELEFLAG_VERTICAL)) {
-		Element->MinCross = w;
-		Element->MinWith = h;
-	}
-	else {
-		Element->MinWith = w;
-		Element->MinCross = h;
-	}
+	WM_Render_GetTextDims(NULL, Element->Text, -1, &w, &h);
+
+	// Apply edge padding
+	w += 2;	h += 2;
+	
+	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
 	);