Merge remote-tracking branch 'gd/master' into staged

This commit is contained in:
Xiao YiFang 2022-11-15 20:02:24 +08:00
commit 6c72f650fe

View file

@ -3780,8 +3780,13 @@ void MainWindow::applyWordsZoomLevel()
} }
wordsZoomBase->setEnabled( cfg.preferences.wordsZoomLevel != 0 ); wordsZoomBase->setEnabled( cfg.preferences.wordsZoomLevel != 0 );
// groupList->setFixedHeight(translateLine->height());
groupList->parentWidget()->layout()->activate(); if( !cfg.preferences.searchInDock )
{
// Invalidating navToolbar's layout displays translateBoxWidget w/o the need to press the toolbar
// extension button when Words Zoom level decreases enough for translateBoxWidget to fit in the toolbar.
navToolbar->layout()->invalidate();
}
if ( scanPopup.get() ) if ( scanPopup.get() )
scanPopup->applyWordsZoomLevel(); scanPopup->applyWordsZoomLevel();