[yast-commit] r38477 - in /branches/tmp/sh/mod-ui/core/libyui/src: YAlignment.cc YContainerWidget.cc YUI_builtins.cc

Author: sh-sh-sh Date: Fri Jun 15 02:46:34 2007 New Revision: 38477 URL: http://svn.opensuse.org/viewcvs/yast?rev=38477&view=rev Log: debugging Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc?rev=38477&r1=38476&r2=38477&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc Fri Jun 15 02:46:34 2007 @@ -182,27 +182,27 @@ long YAlignment::nicesize( YUIDimension dim ) { - long nice_size = firstChild()->nicesize( dim ); - long min_size; + long niceSize = firstChild()->nicesize( dim ); + long minSize; if ( dim == YD_HORIZ ) { - nice_size += leftMargin() + rightMargin(); - min_size = minWidth(); + niceSize += leftMargin() + rightMargin(); + minSize = minWidth(); } else { - nice_size += topMargin() + bottomMargin(); - min_size = minHeight(); + niceSize += topMargin() + bottomMargin(); + minSize = minHeight(); } - return max( min_size, nice_size ); + return max( minSize, niceSize ); } void YAlignment::setSize( long newWidth, long newHeight ) { - if ( ! firstChild() ) + if ( ! hasChildren() ) { y2error( "No child in %s", widgetClass() ); return; @@ -291,6 +291,12 @@ firstChild()->setSize( newChildSize[ YD_HORIZ ], newChildSize[ YD_VERT ] ); moveChild( firstChild(), newChildPos[ YD_HORIZ ], newChildPos[ YD_VERT ] ); + +#if 0 + y2debug( "setSize( alignment, %ld, %ld )", newWidth, newHeight ); + y2debug( "setSize( child, %ld, %ld )", newChildSize[ YD_HORIZ ], newChildSize[ YD_VERT ] ); + y2debug( "moveChild( %ld, %ld) ", newChildPos[ YD_HORIZ ], newChildPos[ YD_VERT ] ); +#endif } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc?rev=38477&r1=38476&r2=38477&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc Fri Jun 15 02:46:34 2007 @@ -42,6 +42,7 @@ void YContainerWidget::addChild( YWidget *child ) { +#if 0 if ( ! _debugLabelWidget ) { if ( dynamic_cast (child ) ) _debugLabelWidget = child; @@ -50,6 +51,7 @@ else if ( dynamic_cast (child ) ) _debugLabelWidget = child; else if ( dynamic_cast (child ) ) _debugLabelWidget = child; } +#endif YWidget::addChild( child ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc?rev=38477&r1=38476&r2=38477&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Fri Jun 15 02:46:34 2007 @@ -1023,7 +1023,7 @@ * @return boolean */ -YCPBoolean YUI::evaluateReplaceWidget( const YCPValue & id_value, const YCPTerm & new_widget ) +YCPBoolean YUI::evaluateReplaceWidget( const YCPValue & id_value, const YCPTerm & newContentTerm ) { if ( ! isSymbolOrId( id_value ) ) { @@ -1041,17 +1041,22 @@ return YCPBoolean( false ); } - YReplacePoint *rp = dynamic_cast ( replacePoint ); - assert( rp ); + // YReplacePoint *rp = dynamic_cast ( replacePoint ); + // assert( rp ); #if VERBOSE_REPLACE_WIDGET - rp->dumpDialogWidgetTree(); + replacePoint->dumpDialogWidgetTree(); #endif YWidget::OptimizeChanges below( *currentDialog() ); // delay screen updates until this block is left - rp->deleteChildren(); + replacePoint->deleteChildren(); - YWidget *widget = createWidgetTree( replacePoint, new_widget ); + YWidget *widget = createWidgetTree( replacePoint, newContentTerm ); + widget->setParent( replacePoint ); + +#if VERBOSE_REPLACE_WIDGET + replacePoint->dumpDialogWidgetTree(); +#endif if ( widget ) { @@ -1064,20 +1069,7 @@ } else { - blockEvents(); // We don't want self-generated events from UI builtins. - - widget = createWidgetTree( replacePoint, YCPTerm( YUIWidget_Empty, YCPList() ) ); - - if ( widget ) - { - currentDialog()->setInitialSize(); - currentDialog()->checkShortcuts(); - } - else // Something bad will happen - y2error( "Severe problem: can't create Empty widget" ); - - unblockEvents(); - + YUI_THROW( YUIException( "ReplaceWidget() failed" ) ); return YCPBoolean( false ); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org