anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 05:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore last selected label when using the "go to label" feature

Browse Source 
of the reference dialog.
This commit is contained in:
Richard Heck 2016-06-06 19:36:27 -04:00
parent f792837531
commit 9d5ffa8e75
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/frontends/qt4/GuiRef.cpp
View File

@ -114,7 +114,13 @@ void GuiRef::changed_adaptor()
void GuiRef::gotoClicked() 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(); gotoRef();
last_reference_.clear();
} }
@ -417,19 +423,18 @@ void GuiRef::redoRefs()
refsTW->addTopLevelItems(refsItems); refsTW->addTopLevelItems(refsItems);
} }
referenceED->setText(oldSelection);
// restore the last selection or, for new insets, highlight // restore the last selection or, for new insets, highlight
// the previous selection // the previous selection
if (!oldSelection.isEmpty() || !last_reference_.isEmpty()) { if (!oldSelection.isEmpty() || !last_reference_.isEmpty()) {
bool const newInset = oldSelection.isEmpty(); bool const newInset = oldSelection.isEmpty();
QString textToFind = newInset ? last_reference_ : oldSelection; QString textToFind = newInset ? last_reference_ : oldSelection;
referenceED->setText(textToFind);
last_reference_.clear(); last_reference_.clear();
QTreeWidgetItemIterator it(refsTW); QTreeWidgetItemIterator it(refsTW);
while (*it) { while (*it) {
if ((*it)->text(0) == textToFind) { if ((*it)->text(0) == textToFind) {
refsTW->setCurrentItem(*it); refsTW->setCurrentItem(*it);
refsTW->setItemSelected(*it, !newInset); refsTW->setItemSelected(*it, true);
//Make sure selected item is visible //Make sure selected item is visible
refsTW->scrollToItem(*it); refsTW->scrollToItem(*it);
last_reference_ = textToFind; last_reference_ = textToFind;