feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: fix gotoCode in error/warning case

Browse Source 
The QmlDesignerPlugin::hideDesigner() jumped again to selected node,
which came after the DocumentWarningWidget already set it.

Change-Id: I6e84342208c6405e8b25b516cd411b30bc48fcdb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-10-05 12:16:58 +02:00
committed by Thomas Hartmann
parent 9a9c29dd82
commit c27c9a3123
5 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qmldesigner/documentwarningwidget.cpp
View File

@@ -65,9 +65,8 @@ DocumentWarningWidget::DocumentWarningWidget(QWidget *parent)
connect(m_navigateLabel, &QLabel::linkActivated, this, [=](const QString &link) {
if (link == QLatin1String("goToCode")) {
RewriterError message = m_messages.at(m_currentMessage);
hide();
emit gotoCodeClicked(message.url().toLocalFile(), message.line(), message.column() - 1);
emitGotoCodeClicked(m_messages.at(m_currentMessage));
} else if (link == QLatin1String("previous")) {
--m_currentMessage;
refreshContent();
@@ -79,10 +78,8 @@ DocumentWarningWidget::DocumentWarningWidget(QWidget *parent)
connect(m_continueButton, &QPushButton::clicked, this, [=]() {
hide();
if (m_mode == ErrorMode) {
RewriterError message = m_messages.at(m_currentMessage);
emit gotoCodeClicked(message.url().toLocalFile(), message.line(), message.column() - 1);
}
if (m_mode == ErrorMode)
emitGotoCodeClicked(m_messages.at(m_currentMessage));
});
connect(m_ignoreWarningsCheckBox, &QCheckBox::toggled, this, &DocumentWarningWidget::ignoreCheckBoxToggled);
@@ -173,11 +170,23 @@ bool DocumentWarningWidget::eventFilter(QObject *object, QEvent *event)
void DocumentWarningWidget::showEvent(QShowEvent *event)
{
m_gotoCodeWasClicked = false;
moveToParentCenter();
refreshContent();
Utils::FakeToolTip::showEvent(event);
}
bool DocumentWarningWidget::gotoCodeWasClicked()
{
return m_gotoCodeWasClicked;
}
void DocumentWarningWidget::emitGotoCodeClicked(const RewriterError &message)
{
m_gotoCodeWasClicked = true;
emit gotoCodeClicked(message.url().toLocalFile(), message.line(), message.column() - 1);
}
bool DocumentWarningWidget::warningsEnabled() const
{
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();