Ensuring that editor keeps focus when live preview is enabled #1214

dvorka · Feb 17, 2020 · 8cc3a10 · 8cc3a10
1 parent 48c9ab3
commit 8cc3a10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/src/qt/note_editor_view.cpp b/app/src/qt/note_editor_view.cpp
@@ -566,8 +566,8 @@ void NoteEditorView::lineNumberPanelPaintEvent(QPaintEvent* event)
 
     QTextBlock block = firstVisibleBlock();
     int blockNumber = block.blockNumber();
-    int top = (int) blockBoundingGeometry(block).translated(contentOffset()).top();
-    int bottom = top + (int) blockBoundingRect(block).height();
+    int top = static_cast<int>(blockBoundingGeometry(block).translated(contentOffset()).top());
+    int bottom = top + static_cast<int>(blockBoundingRect(block).height());
 
     int currentLine = textCursor().blockNumber();
     while(block.isValid() && top <= event->rect().bottom()) {
@@ -583,7 +583,7 @@ void NoteEditorView::lineNumberPanelPaintEvent(QPaintEvent* event)
 
         block = block.next();
         top = bottom;
-        bottom = top + (int)blockBoundingRect(block).height();
+        bottom = top + static_cast<int>(blockBoundingRect(block).height());
         ++blockNumber;
     }
 }

diff --git a/app/src/qt/orloj_presenter.cpp b/app/src/qt/orloj_presenter.cpp
@@ -817,8 +817,14 @@ void OrlojPresenter::slotRefreshCurrentNotePreview() {
     if(!config.isUiHoistedMode()) {
         if(isFacetActive(OrlojPresenterFacets::FACET_EDIT_NOTE)) {
             noteViewPresenter->refreshCurrent();
+#if defined(__APPLE__) || defined(_WIN32)
+            getNoteEdit()->getView()->getNoteEditor()->setFocus();
+#endif
         } else if(isFacetActive(OrlojPresenterFacets::FACET_EDIT_OUTLINE_HEADER)) {
             outlineHeaderViewPresenter->refreshCurrent();
+#if defined(__APPLE__) || defined(_WIN32)
+            getOutlineHeaderEdit()->getView()->getHeaderEditor()->setFocus();
+#endif
         }
     }
 }