mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-20 00:41:23 +00:00
Always honor the coordinate and size when creating a new window in
slotCreateNewWindow.
REVIEW: 101477
(cherry picked from commit 8ea273f60e
)
This commit is contained in:
parent
9b4b80b081
commit
67625dcea3
|
@ -1272,26 +1272,20 @@ void KonqMainWindow::slotCreateNewWindow( const KUrl &url,
|
|||
mainWindow->viewManager()->setActivePart(*part);
|
||||
}
|
||||
|
||||
if ( windowArgs.x() != -1 )
|
||||
mainWindow->move( windowArgs.x(), mainWindow->y() );
|
||||
if ( windowArgs.y() != -1 )
|
||||
mainWindow->move( mainWindow->x(), windowArgs.y() );
|
||||
|
||||
int width;
|
||||
if ( windowArgs.width() != -1 )
|
||||
width = windowArgs.width();
|
||||
else
|
||||
width = mainWindow->width();
|
||||
|
||||
int height;
|
||||
if ( windowArgs.height() != -1 )
|
||||
height = windowArgs.height();
|
||||
else
|
||||
height = mainWindow->height();
|
||||
|
||||
mainWindow->resize( width, height );
|
||||
#ifdef Q_WS_X11
|
||||
// WORKAROUND: Clear the window state information set by KMainWindow::restoreWindowSize
|
||||
// so that the size and location settings we set below always take effect.
|
||||
KWindowSystem::clearState(mainWindow->winId(), NET::Max);
|
||||
#endif
|
||||
|
||||
// process the window args
|
||||
const int xPos = ((windowArgs.x() == -1) ? mainWindow->x() : windowArgs.x());
|
||||
const int yPos = ((windowArgs.y() == -1) ? mainWindow->y() : windowArgs.y());
|
||||
const int width = ((windowArgs.width() == -1) ? mainWindow->width() : windowArgs.width());
|
||||
const int height = ((windowArgs.height() == -1) ? mainWindow->height() : windowArgs.height());
|
||||
|
||||
mainWindow->move ( xPos, yPos );
|
||||
mainWindow->resize( width, height );
|
||||
|
||||
if ( !windowArgs.isMenuBarVisible() )
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue