Usermode/AxWin3 - Added names to widget types

[tpg/acess2.git] / Usermode / Applications / axwin3_src / WM / renderers / widget / image.c

diff --git a/Usermode/Applications/axwin3_src/WM/renderers/widget/image.c b/Usermode/Applications/axwin3_src/WM/renderers/widget/image.c
index f1f3155..692ac5b 100644 (file)
--- 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
        );