From d382cbf483ee839a4aea01688beb0ddf663affbd Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Fri, 8 Sep 2017 15:07:01 +0300
Subject: [PATCH] fixes editor key handling, file dialog

---
 src/dlangui/dialogs/filedlg.d | 5 +++++
 src/dlangui/widgets/editors.d | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/dlangui/dialogs/filedlg.d b/src/dlangui/dialogs/filedlg.d
index 92814b86..50ed67d0 100644
--- a/src/dlangui/dialogs/filedlg.d
+++ b/src/dlangui/dialogs/filedlg.d
@@ -898,6 +898,7 @@ class FilePathPanelItem : HorizontalLayout {
         addChild(_button);
         margins(Rect(2.pointsToPixels + 1, 0, 2.pointsToPixels + 1, 0));
     }
+
     private bool onTextClick(Widget src) {
         if (onPathSelectionListener.assigned)
             return onPathSelectionListener(_path);
@@ -1134,6 +1135,10 @@ class FileNameEditLine : HorizontalLayout {
     /// editor content is changed
     Signal!EditableContentChangeListener contentChange;
 
+    @property ref Signal!EditorActionHandler editorAction() {
+        return _edFileName.editorAction;
+    }
+
     this(string ID = null) {
         super(ID);
         _caption = UIString.fromId("TITLE_OPEN_FILE"c).value;
diff --git a/src/dlangui/widgets/editors.d b/src/dlangui/widgets/editors.d
index 994b3059..a62bc48d 100644
--- a/src/dlangui/widgets/editors.d
+++ b/src/dlangui/widgets/editors.d
@@ -1624,6 +1624,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
                 return true;
             case SelectAll:
                 selectAll();
+                ensureCaretVisible();
                 return true;
             case ToggleBookmark:
                 if (_content.multiline) {
@@ -1654,7 +1655,6 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
         _selectionRange.start.pos = 0;
         _selectionRange.end = _content.lineEnd(_content.length - 1);
         _caretPos = _selectionRange.end;
-        ensureCaretVisible();
         requestActionsUpdate();
     }
 
@@ -1809,7 +1809,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
         //    return true;
         //}
         bool res = super.onKeyEvent(event);
-        if (focused) startCaretBlinking();
+        //if (focused) startCaretBlinking();
         return res;
     }