X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Frenderers%2Fwidget.c;h=247152d7eda4cdd0e9f6aab81c285337988ef242;hb=27cb4fff4ed854d8be598a1157265c6de8aa035a;hp=12566d53c991feac90fa5f7772c8eb1d4020e2dd;hpb=ed78a9ac44c440180c37c1cbbbd7ecbc4d9076d7;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/renderers/widget.c b/Usermode/Applications/axwin3_src/WM/renderers/widget.c
index 12566d53..247152d7 100644
--- a/Usermode/Applications/axwin3_src/WM/renderers/widget.c
+++ b/Usermode/Applications/axwin3_src/WM/renderers/widget.c
@@ -249,7 +249,7 @@ void Widget_UpdateDimensions(tElement *Element)
 		if( child->Flags & ELEFLAG_ABSOLUTEPOS )	continue ;
 		
 		// --- Width ---
-		if( child->Flags & ELEFLAG_NOEXPAND )
+		if( child->Flags & (bVertical ? ELEFLAG_NOEXPAND : ELEFLAG_NOSTRETCH) )
 			w = child->MinW;
 		else if( bVertical )
 			w = child->FixedCross ? child->FixedCross : fullCross;
@@ -257,7 +257,7 @@ void Widget_UpdateDimensions(tElement *Element)
 			w = child->FixedWith ? child->FixedWith : dynWith;
 	
 		// --- Height ---
-		if( child->Flags & ELEFLAG_NOSTRETCH )
+		if( child->Flags & (bVertical ? ELEFLAG_NOSTRETCH : ELEFLAG_NOEXPAND) )
 			h = child->MinH;
 		else if( bVertical )
 			h = child->FixedWith ? child->FixedWith : dynWith;
@@ -766,6 +766,7 @@ void Widget_Fire(tElement *Element)
 {
 	tWidgetMsg_Fire	msg;
 	msg.WidgetID = Element->ID;
+	_SysDebug("Widget_Fire: Fire on %p %i", Element->Window, Element->ID);
 	WM_SendMessage(Element->Window, Element->Window, MSG_WIDGET_FIRE, sizeof(msg), &msg);
 }