From adcdf22042a80a3aed7d2e4efafb436709caddf8 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Mon, 6 Jun 2016 19:36:27 -0400 Subject: [PATCH] Restore last selected label when using the "go to label" feature of the reference dialog. (cherry picked from commit 9d5ffa8e752213379d0ff611bd16deec1ab21c0a) --- src/frontends/qt4/GuiRef.cpp | 11 ++++++++--- status.22x | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp index 1150d586b2..555ccce1a4 100644 --- a/src/frontends/qt4/GuiRef.cpp +++ b/src/frontends/qt4/GuiRef.cpp @@ -114,7 +114,13 @@ void GuiRef::changed_adaptor() void GuiRef::gotoClicked() { + // By setting last_reference_, we ensure that the reference + // to which we are going (or from which we are returning) is + // restored in the dialog. It's a bit of a hack, but it works, + // and no-one seems to have any better idea. + last_reference_ = referenceED->text(); gotoRef(); + last_reference_.clear(); } @@ -417,19 +423,18 @@ void GuiRef::redoRefs() refsTW->addTopLevelItems(refsItems); } - referenceED->setText(oldSelection); - // restore the last selection or, for new insets, highlight // the previous selection if (!oldSelection.isEmpty() || !last_reference_.isEmpty()) { bool const newInset = oldSelection.isEmpty(); QString textToFind = newInset ? last_reference_ : oldSelection; + referenceED->setText(textToFind); last_reference_.clear(); QTreeWidgetItemIterator it(refsTW); while (*it) { if ((*it)->text(0) == textToFind) { refsTW->setCurrentItem(*it); - refsTW->setItemSelected(*it, !newInset); + refsTW->setItemSelected(*it, true); //Make sure selected item is visible refsTW->scrollToItem(*it); last_reference_ = textToFind; diff --git a/status.22x b/status.22x index 6da8c02876..bf985014f8 100644 --- a/status.22x +++ b/status.22x @@ -43,6 +43,9 @@ What's new - Implement "Dissolve Inset" and "Show Label" context menu items for arguments (bug 10150). +- Restore selected reference when using "Go to label" and "Go back" in the + cross-reference dialog. + * DOCUMENTATION AND LOCALIZATION -- 2.39.5