hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-12-02 19:14:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Properly update the results pane when closing tabs

Browse source
This commit is contained in:
Tvangeste 2013-06-07 15:58:27 +02:00
parent 9bb6768bd9
commit 43f2b67095
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
mainwindow.cc
View file

@ -1401,37 +1401,22 @@ ArticleView * MainWindow::createNewTab( bool switchToIt,
void MainWindow::tabCloseRequested( int x ) void MainWindow::tabCloseRequested( int x )
{ {
// if ( ui.tabWidget->count() < 2 )
// return; // We should always have at least one open tab
QWidget * w = ui.tabWidget->widget( x ); QWidget * w = ui.tabWidget->widget( x );
if (cfg.preferences.mruTabOrder)
{
//removeTab activates next tab and emits currentChannged SIGNAL
//This is not what we want for MRU, so disable the signal for a moment
disconnect( ui.tabWidget, SIGNAL( currentChanged( int ) ),
this, SLOT( tabSwitched( int ) ) );
}
ui.tabWidget->removeTab( x );
if (cfg.preferences.mruTabOrder)
{
connect( ui.tabWidget, SIGNAL( currentChanged( int ) ), this, SLOT( tabSwitched( int ) ) );
}
mruList.removeOne(w); mruList.removeOne(w);
delete w; // In MRU case: First, we switch to the appropriate tab
// and only then remove the old one.
//activate a tab in accordance with MRU //activate a tab in accordance with MRU
if ( mruList.size() > 0 ) { if ( cfg.preferences.mruTabOrder && mruList.size() > 0 ) {
ui.tabWidget->setCurrentWidget(mruList.at(0)); ui.tabWidget->setCurrentWidget(mruList.at(0));
} }
// if everything is closed, add new tab ui.tabWidget->removeTab( x );
delete w;
// if everything is closed, add a new tab
if ( ui.tabWidget->count() == 0 ) if ( ui.tabWidget->count() == 0 )
addNewTab(); addNewTab();
} }