Merge pull request #348 from KLayout/help-link-not-working

Fixed: help link not working
This commit is contained in:
Matthias Köfferlein 2019-09-06 23:24:23 +02:00 committed by GitHub
commit 0388d51f6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions

View File

@ -460,14 +460,14 @@ MainWindow::MainWindow (QApplication *app, lay::Plugin *plugin_parent, const cha
}
mw_instance = this;
lay::register_help_handler (this, SLOT (show_help (const QString &)), SLOT (show_modal_help (const QString &)));
mp_setup_form = new SettingsForm (0, plugin_root (), "setup_form"),
db::LibraryManager::instance ().changed_event.add (this, &MainWindow::libraries_changed);
init_menu ();
lay::register_help_handler (this, SLOT (show_help (const QString &)), SLOT (show_modal_help (const QString &)));
mp_assistant = new lay::HelpDialog (this);
mp_pr = new lay::ProgressReporter ();
@ -4792,7 +4792,9 @@ MainWindow::cm_show_assistant ()
void
MainWindow::show_help (const QString &url)
{
show_assistant_url (tl::to_string (url), false);
// NOTE: from inside a modal widget we show the help dialog modal too
// (otherwise it's not usable)
show_assistant_url (tl::to_string (url), QApplication::activeModalWidget () != 0);
}
void