Fix glitch where the initially focused LineEdit would scroll part of …

…its content out of view
bonki · Apr 11, 2017 · 8bf5181 · 8bf5181
1 parent 42ba286
commit 8bf5181
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 51 deletions.
diff --git a/dialog.go b/dialog.go
@@ -7,7 +7,6 @@
 package walk
 
 import (
-	"syscall"
 	"unsafe"
 )
 
@@ -156,54 +155,6 @@ func (dlg *Dialog) Close(result int) {
 	dlg.FormBase.Close()
 }
 
-func firstFocusableDescendantCallback(hwnd win.HWND, lParam uintptr) uintptr {
-	widget := windowFromHandle(hwnd)
-
-	if widget == nil || !widget.Visible() || !widget.Enabled() {
-		return 1
-	}
-
-	style := uint(win.GetWindowLong(hwnd, win.GWL_STYLE))
-	// FIXME: Ugly workaround for NumberEdit
-	_, isTextSelectable := widget.(textSelectable)
-	if style&win.WS_TABSTOP > 0 || isTextSelectable {
-		hwndPtr := (*win.HWND)(unsafe.Pointer(lParam))
-		*hwndPtr = hwnd
-		return 0
-	}
-
-	return 1
-}
-
-var firstFocusableDescendantCallbackPtr = syscall.NewCallback(firstFocusableDescendantCallback)
-
-func firstFocusableDescendant(container Container) Window {
-	var hwnd win.HWND
-
-	win.EnumChildWindows(container.Handle(), firstFocusableDescendantCallbackPtr, uintptr(unsafe.Pointer(&hwnd)))
-
-	return windowFromHandle(hwnd)
-}
-
-type textSelectable interface {
-	SetTextSelection(start, end int)
-}
-
-func (dlg *Dialog) focusFirstCandidateDescendant() {
-	window := firstFocusableDescendant(dlg)
-	if window == nil {
-		return
-	}
-
-	if err := window.SetFocus(); err != nil {
-		return
-	}
-
-	if textSel, ok := window.(textSelectable); ok {
-		textSel.SetTextSelection(0, -1)
-	}
-}
-
 func (dlg *Dialog) Show() {
 	if dlg.owner != nil {
 		var size Size
@@ -231,8 +182,6 @@ func (dlg *Dialog) Show() {
 	}
 
 	dlg.FormBase.Show()
-
-	dlg.focusFirstCandidateDescendant()
 }
 
 func fitRectToScreen(hWnd win.HWND, r Rectangle) Rectangle {

diff --git a/form.go b/form.go
@@ -305,6 +305,8 @@ func (fb *FormBase) Run() int {
 		layout.Update(false)
 	}
 
+	fb.focusFirstCandidateDescendant()
+
 	fb.startingPublisher.Publish()
 
 	var msg win.MSG
@@ -569,3 +571,51 @@ func (fb *FormBase) WndProc(hwnd win.HWND, msg uint32, wParam, lParam uintptr) u
 
 	return fb.WindowBase.WndProc(hwnd, msg, wParam, lParam)
 }
+
+func (fb *FormBase) focusFirstCandidateDescendant() {
+	window := firstFocusableDescendant(fb)
+	if window == nil {
+		return
+	}
+
+	if err := window.SetFocus(); err != nil {
+		return
+	}
+
+	if textSel, ok := window.(textSelectable); ok {
+		textSel.SetTextSelection(0, -1)
+	}
+}
+
+func firstFocusableDescendantCallback(hwnd win.HWND, lParam uintptr) uintptr {
+	widget := windowFromHandle(hwnd)
+
+	if widget == nil || !widget.Visible() || !widget.Enabled() {
+		return 1
+	}
+
+	style := uint(win.GetWindowLong(hwnd, win.GWL_STYLE))
+	// FIXME: Ugly workaround for NumberEdit
+	_, isTextSelectable := widget.(textSelectable)
+	if style&win.WS_TABSTOP > 0 || isTextSelectable {
+		hwndPtr := (*win.HWND)(unsafe.Pointer(lParam))
+		*hwndPtr = hwnd
+		return 0
+	}
+
+	return 1
+}
+
+var firstFocusableDescendantCallbackPtr = syscall.NewCallback(firstFocusableDescendantCallback)
+
+func firstFocusableDescendant(container Container) Window {
+	var hwnd win.HWND
+
+	win.EnumChildWindows(container.Handle(), firstFocusableDescendantCallbackPtr, uintptr(unsafe.Pointer(&hwnd)))
+
+	return windowFromHandle(hwnd)
+}
+
+type textSelectable interface {
+	SetTextSelection(start, end int)
+}