mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-15 20:50:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

MainWindow: pass optional parameter to toggleWindow() to force showing window

Browse Source 
There are use cases where we want to force to show a certain window.
This commit is contained in:
Tobias Doerffel
2013-01-07 22:06:37 +01:00
parent 9ec7613678
commit e3e2e48b71
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/MainWindow.cpp
View File

@@ -1,9 +1,7 @@
#ifndef SINGLE_SOURCE_COMPILE
/*
* main_window.cpp - implementation of LMMS-main-window
*
* Copyright (c) 2004-2011 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2013 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -810,16 +808,17 @@ void MainWindow::help( void )
void MainWindow::toggleWindow( QWidget * _w )
void MainWindow::toggleWindow( QWidget *window, bool forceShow )
{
QWidget * parent = _w->parentWidget();
QWidget *parent = window->parentWidget();
if( m_workspace->activeSubWindow() != parent
|| parent->isHidden() )
if( forceShow ||
m_workspace->activeSubWindow() != parent ||
parent->isHidden() )
{
parent->show();
_w->show();
_w->setFocus();
window->show();
window->setFocus();
}
else
{
@@ -836,9 +835,9 @@ void MainWindow::toggleWindow( QWidget * _w )
void MainWindow::toggleBBEditorWin( void )
void MainWindow::toggleBBEditorWin( bool forceShow )
{
toggleWindow( engine::getBBEditor() );
toggleWindow( engine::getBBEditor(), forceShow );
}
@@ -1072,5 +1071,3 @@ void MainWindow::autoSave()
#include "moc_MainWindow.cxx"
#endif