From 2d2661a554c5195069caf2d3eead729f52898a8d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 23 May 2013 11:33:34 -0500 Subject: Fix incomplete size restoration in TDEMainWindow class This resolves Bug 1519 Clean up build warnings in KEditToolbar --- tdeui/tdemainwindow.cpp | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'tdeui/tdemainwindow.cpp') diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp index ba9c51556..a5dde30e3 100644 --- a/tdeui/tdemainwindow.cpp +++ b/tdeui/tdemainwindow.cpp @@ -955,16 +955,26 @@ void TDEMainWindow::restoreWindowSize( TDEConfig * config ) } if ( !size.isEmpty() ) { #ifdef Q_WS_X11 - int state = ( size.width() > desk.width() ? NET::MaxHoriz : 0 ) - | ( size.height() > desk.height() ? NET::MaxVert : 0 ); - if(( state & NET::Max ) == NET::Max ) - ; // no resize - else if(( state & NET::MaxHoriz ) == NET::MaxHoriz ) + int state = 0; + if (size.width() > desk.width()) { + state = state | NET::MaxHoriz; + } + if (size.height() > desk.height()) { + state = state | NET::MaxVert; + } + + if (( state & NET::Max ) == NET::Max ) { + resize( desk.width(), desk.height()); + } + else if(( state & NET::MaxHoriz ) == NET::MaxHoriz ) { resize( width(), size.height()); - else if(( state & NET::MaxVert ) == NET::MaxVert ) + } + else if(( state & NET::MaxVert ) == NET::MaxVert ) { resize( size.width(), height()); - else + } + else { resize( size ); + } // TQWidget::showMaximized() is both insufficient and broken KWin::setState( winId(), state ); #else -- cgit v1.2.1