Fix it again, but now also for enter key (#1291)
This commit is contained in:
@@ -610,6 +610,7 @@ class GuiMain(QMainWindow):
|
|||||||
logger.debug("Requested item '%s' is not a document", tHandle)
|
logger.debug("Requested item '%s' is not a document", tHandle)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
self._changeView(nwView.EDITOR)
|
||||||
cHandle = self.docEditor.docHandle()
|
cHandle = self.docEditor.docHandle()
|
||||||
if cHandle == tHandle:
|
if cHandle == tHandle:
|
||||||
self.docEditor.setCursorLine(tLine)
|
self.docEditor.setCursorLine(tLine)
|
||||||
@@ -618,7 +619,6 @@ class GuiMain(QMainWindow):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
self.closeDocument(beforeOpen=True)
|
self.closeDocument(beforeOpen=True)
|
||||||
self._changeView(nwView.EDITOR)
|
|
||||||
if self.docEditor.loadText(tHandle, tLine):
|
if self.docEditor.loadText(tHandle, tLine):
|
||||||
self.theProject.data.setLastHandle(tHandle, "editor")
|
self.theProject.data.setLastHandle(tHandle, "editor")
|
||||||
self.projView.setSelectedHandle(tHandle, doScroll=doScroll)
|
self.projView.setSelectedHandle(tHandle, doScroll=doScroll)
|
||||||
@@ -1512,10 +1512,8 @@ class GuiMain(QMainWindow):
|
|||||||
hItem = self.theProject.index.getItemHeader(tHandle, sTitle)
|
hItem = self.theProject.index.getItemHeader(tHandle, sTitle)
|
||||||
if hItem is not None:
|
if hItem is not None:
|
||||||
tLine = hItem.line
|
tLine = hItem.line
|
||||||
self.mainStack.setCurrentWidget(self.splitMain)
|
|
||||||
self.openDocument(tHandle, tLine=tLine, changeFocus=setFocus)
|
self.openDocument(tHandle, tLine=tLine, changeFocus=setFocus)
|
||||||
elif tMode == nwDocMode.VIEW:
|
elif tMode == nwDocMode.VIEW:
|
||||||
self.mainStack.setCurrentWidget(self.splitMain)
|
|
||||||
self.viewDocument(tHandle=tHandle, sTitle=sTitle)
|
self.viewDocument(tHandle=tHandle, sTitle=sTitle)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user