perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug fix in FDialog onWindowActive() for combined setFocus() and activateWindow()

This commit is contained in:
Markus Gans 2016-06-16 22:50:34 +02:00
parent 07fbe91cea
commit 203c50f4e6
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2016-06-16 Markus Gans <guru.mail@muenster.de> 2016-06-16 Markus Gans <guru.mail@muenster.de>
* Bug fix in FTerm updateVTerm() for updates from vdesktop * Bug fix in FTerm updateVTerm() for updates from vdesktop
* Bug fix in FDialog onWindowActive() for combined setFocus()
and activateWindow()
2016-06-13 Markus Gans <guru.mail@muenster.de> 2016-06-13 Markus Gans <guru.mail@muenster.de>
* Improved title bar menu integration * Improved title bar menu integration

17
src/fdialog.cpp
View File

@ -724,15 +724,18 @@ void FDialog::onWindowActive (FEvent*)
if ( isVisible() && isShown() ) if ( isVisible() && isShown() )
drawTitleBar(); drawTitleBar();
if ( focus_widget && focus_widget->isVisible() && focus_widget->isShown() ) if ( ! FWidget::getFocusWidget() )
{ {
focus_widget->setFocus(); if ( focus_widget && focus_widget->isVisible() && focus_widget->isShown() )
focus_widget->redraw(); {
if ( statusBar() ) focus_widget->setFocus();
statusBar()->drawMessage(); focus_widget->redraw();
if ( statusBar() )
statusBar()->drawMessage();
}
else
focusFirstChild();
} }
else
focusFirstChild();
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------