[yast-commit] r42866 - in /trunk/qt4/src: YQDialog.cc YQMainWinDock.cc YQMainWinDock.h

Author: coolo Date: Sun Dec 9 17:42:47 2007 New Revision: 42866 URL: http://svn.opensuse.org/viewcvs/yast?rev=42866&view=rev Log: making DefaultSizeDialogs.ycp work - with transparent widgets a simple raise() isn't good enough for a "stacked widget for the poor" Modified: trunk/qt4/src/YQDialog.cc trunk/qt4/src/YQMainWinDock.cc trunk/qt4/src/YQMainWinDock.h Modified: trunk/qt4/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/YQDialog.cc?rev=42866&r1=42865&r2=42866&view=diff ============================================================================== --- trunk/qt4/src/YQDialog.cc (original) +++ trunk/qt4/src/YQDialog.cc Sun Dec 9 17:42:47 2007 @@ -46,14 +46,11 @@ YQDialog::YQDialog( YDialogType dialogType, YDialogColorMode colorMode ) -// we first initialize without parent and then set a parent, so we can choose a parent -// based on the YDialog constructor - : QWidget( 0 ) + : QWidget( chooseParent( dialogType ), + dialogType == YMainDialog ? YQMainDialogWFlags : YQPopupDialogWFlags ) , YDialog( dialogType, colorMode ) { setWidgetRep( this ); - QWidget::setParent( chooseParent( dialogType ), - dialogType == YMainDialog ? YQMainDialogWFlags : YQPopupDialogWFlags ); _userResized = false; _focusButton = 0; @@ -84,6 +81,11 @@ { setWindowFlags( YQPopupDialogWFlags ); } + + if ( QWidget::parent() == YQMainWinDock::mainWinDock() ) + { + YQMainWinDock::mainWinDock()->add( this ); + } } @@ -91,7 +93,7 @@ { if ( dialogType() == YMainDialog ) { - YQMainWinDock::mainWinDock()->remove( (QWidget *) widgetRep() ); + YQMainWinDock::mainWinDock()->remove( this ); } } @@ -191,6 +193,7 @@ if ( hasChildren() ) { + ( ( QWidget* )firstChild()->widgetRep() )->show(); firstChild()->setSize( newWidth, newHeight ); } Modified: trunk/qt4/src/YQMainWinDock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/YQMainWinDock.cc?rev=42866&r1=42865&r2=42866&view=diff ============================================================================== --- trunk/qt4/src/YQMainWinDock.cc (original) +++ trunk/qt4/src/YQMainWinDock.cc Sun Dec 9 17:42:47 2007 @@ -43,7 +43,7 @@ YQMainWinDock::YQMainWinDock() : QWidget( 0, // parent, name YQUI::ui()->noBorder() ? - Qt::Widget : + Qt::FramelessWindowHint : Qt::Window ) { setWindowTitle( "YaST2" ); @@ -65,23 +65,6 @@ void -YQMainWinDock::childEvent( QChildEvent * event ) -{ - if ( event ) - { - QWidget * widget = dynamic_cast ( event->child() ); - - if ( widget && ( event->type() == QEvent::ChildAdded ) ) - { - add( widget ); - } - } - - QWidget::childEvent( event ); -} - - -void YQMainWinDock::resizeEvent( QResizeEvent * event ) { if ( event ) @@ -116,10 +99,8 @@ if ( ! _widgetStack.empty() ) { QWidget * dialog = _widgetStack.back(); - dialog->raise(); - - if ( dialog->isHidden() ) - dialog->show(); + dialog->raise(); + dialog->show(); } } @@ -129,15 +110,17 @@ { YUI_CHECK_PTR( dialog ); - if ( dialog->isHidden() ) - dialog->show(); + if ( !_widgetStack.empty() ) + _widgetStack.back()->hide(); + + dialog->raise(); + dialog->show(); y2debug( "Adding dialog %p to mainWinDock", dialog ); _widgetStack.push_back( dialog ); resizeVisibleChild(); - if ( isHidden() ) - show(); + show(); } @@ -191,6 +174,7 @@ { dialog = _widgetStack.back(); // Get the next dialog from the stack dialog->raise(); // and raise it + dialog->show(); resizeVisibleChild(); } } Modified: trunk/qt4/src/YQMainWinDock.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/YQMainWinDock.h?rev=42866&r1=42865&r2=42866&view=diff ============================================================================== --- trunk/qt4/src/YQMainWinDock.h (original) +++ trunk/qt4/src/YQMainWinDock.h Sun Dec 9 17:42:47 2007 @@ -129,13 +129,6 @@ virtual void paintEvent( QPaintEvent * event ); /** - * Child inserted/removed event. - * - * Reimplemented from QObject. - **/ - virtual void childEvent( QChildEvent * event ); - - /** * Resize event. * * Reimplemented from QWidget. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org