X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Frenderers%2Fwidget%2Fimage.c;h=692ac5b30c70cc937b96ceeaa14a39ac8080f3f5;hb=c658c88d73bcd7750fb7d727dfd9812d3d02c1bb;hp=f1f3155cccd9581db6b4627e8acf4aa3012de992;hpb=2f16fec349eabb42f5e23ea2b821f149fa6b767e;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/renderers/widget/image.c b/Usermode/Applications/axwin3_src/WM/renderers/widget/image.c
index f1f3155c..692ac5b3 100644
--- a/Usermode/Applications/axwin3_src/WM/renderers/widget/image.c
+++ b/Usermode/Applications/axwin3_src/WM/renderers/widget/image.c
@@ -25,28 +25,24 @@ void Widget_Image_UpdateText(tElement *Element, const char *Text)
 	if(Element->Data)	free(Element->Data);
 	Element->Data = Image_Load( Text );
 	if(!Element->Data) {
+		_SysDebug("Widget::Image - Load failed '%s'", Text);
 //		Element->Flags &= ~ELEFLAG_FIXEDSIZE;
 		return ;
 	}
 	
 	Element->CachedW = ((tImage*)Element->Data)->Width;
 	Element->CachedH = ((tImage*)Element->Data)->Height;
-	
-	if(Element->Parent && (Element->Parent->Flags & ELEFLAG_VERTICAL) ) {
-		Element->MinCross = ((tImage*)Element->Data)->Width;
-		Element->MinWith = ((tImage*)Element->Data)->Height;
-	}
-	else {
-		Element->MinWith = ((tImage*)Element->Data)->Width;
-		Element->MinCross = ((tImage*)Element->Data)->Height;
-	}
 
+	Element->MinW = ((tImage*)Element->Data)->Width;
+	Element->MinH = ((tImage*)Element->Data)->Width;
+	
 	Widget_UpdateMinDims(Element->Parent);
 	
-	// NOTE: Doesn't update Element->Text because it's useless
+	// NOTE: Doesn't update Element->Text because it's not really needed here
 }
 
-DEFWIDGETTYPE(ELETYPE_IMAGE,
+DEFWIDGETTYPE(ELETYPE_IMAGE, "Image",
+	WIDGETTYPE_FLAG_NOCHILDREN,
 	.Render = Widget_Image_Render,
 	.UpdateText = Widget_Image_UpdateText
 	);