diff --git a/ChangeLog b/ChangeLog index 1382b6c9..d588e0d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * Improve adjustSize() * Implement adjustSizeGlobal() for all widgets * Don't focus menus with focusFirstChild() and focusLastChild() + * Remove duplicate code 2016-05-01 Markus Gans * Better terminal identification diff --git a/src/fwidget.cpp b/src/fwidget.cpp index d361f5c0..68e3814f 100644 --- a/src/fwidget.cpp +++ b/src/fwidget.cpp @@ -1264,32 +1264,21 @@ void FWidget::resize() closeConsole(); resizeVTerm(); resizeArea (vdesktop); + if ( menubar ) { menubar->setGeometry(1, 1, width, 1, false); if ( vmenubar ) resizeArea(vmenubar); - menubar->adjustSize(); } + if ( statusbar ) { statusbar->setGeometry(1, height, width, 1, false); if ( vstatusbar ) resizeArea(vstatusbar); - statusbar->adjustSize(); - } - if ( window_list && ! window_list->empty() ) - { - widgetList::const_iterator iter, end; - iter = window_list->begin(); - end = window_list->end(); - - while ( iter != end ) - { - (*iter)->adjustSize(); - ++iter; - } } + adjustSizeGlobal(); } else adjustSize();