hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-30 17:24:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix: exception with PopupFocusReason

Browse source
This commit is contained in:
xiaoyifang 2022-03-01 20:32:12 +08:00 committed by xiaoyifang
parent 4a0545b299
commit 5d8b410a8b
3 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
articlewebview.cc
View file

@ -107,10 +107,12 @@ bool ArticleWebView::eventFilter(QObject *obj, QEvent *ev) {
return true;
}
}
// if (ev->type() == QEvent::FocusIn) {
// QFocusEvent *pe = static_cast<QFocusEvent *>(ev);
// focusInEvent(pe);
// }
if( ev->type() == QEvent::FocusIn )
{
QFocusEvent * pe = static_cast< QFocusEvent * >( ev );
focusInEvent( pe );
return true;
}
return QWebEngineView::eventFilter(obj, ev);
}

15
mainwindow.cc
View file

@ -772,7 +772,6 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
ui.searchPane->setVisible( cfg.preferences.searchInDock );
applyProxySettings();
applyWebSettings();
connect( &dictNetMgr, SIGNAL( proxyAuthenticationRequired( QNetworkProxy, QAuthenticator * ) ),
this, SLOT( proxyAuthentication( QNetworkProxy, QAuthenticator * ) ) );
@ -1231,7 +1230,7 @@ void MainWindow::closeEvent( QCloseEvent * ev )
// Don't ignore the close event, because doing so cancels session logout if
// the main window is visible when the user attempts to log out.
// The main window will be only hidden, because QApplication::quitOnLastWindowClosed
// property is false and Qt::WA_DeleteOnClose widget attribute is not set.
// property is false and Qt::WA_DeleteOnClose widget is not set.
Q_ASSERT(!QApplication::quitOnLastWindowClosed());
Q_ASSERT(!testAttribute(Qt::WA_DeleteOnClose));
#else
@ -1305,17 +1304,6 @@ void MainWindow::applyProxySettings()
QNetworkProxy::setApplicationProxy( proxy );
}
void MainWindow::applyWebSettings()
{
QWebEngineSettings * defaultSettings = QWebEngineSettings::defaultSettings();
defaultSettings->setAttribute( QWebEngineSettings::PluginsEnabled, cfg.preferences.enableWebPlugins );
defaultSettings->setAttribute( QWebEngineSettings::PlaybackRequiresUserGesture, false );
defaultSettings->setAttribute( QWebEngineSettings::WebAttribute::LocalContentCanAccessRemoteUrls, true );
defaultSettings->setAttribute( QWebEngineSettings::WebAttribute::LocalContentCanAccessFileUrls, true );
defaultSettings->setAttribute( QWebEngineSettings::WebAttribute::ErrorPageEnabled, false );
defaultSettings->setAttribute( QWebEngineSettings::WebAttribute::JavascriptCanOpenWindows, true );
}
void MainWindow::setupNetworkCache( int maxSize )
{
// x << 20 == x * 2^20 converts mebibytes to bytes.
@ -2229,7 +2217,6 @@ void MainWindow::editPreferences()
updateTrayIcon();
applyProxySettings();
applyWebSettings();
ui.tabWidget->setHideSingleTab(cfg.preferences.hideSingleTab);

1
mainwindow.hh
View file

@ -209,7 +209,6 @@ private:
void closeEvent( QCloseEvent * );
void applyProxySettings();
void applyWebSettings();
void setupNetworkCache( int maxSize );
void makeDictionaries();
void updateStatusLine();