Merge pull request #5 from harry1453/specify-hwnd

Specify hwnd

_examples/notusingutil/OpenFile.go

@@ -32,8 +32,8 @@ func main() {
 		log.Fatal(err)
 	}
 	go func() {
-		time.Sleep(time.Second)
-		if err := openDialog.SetFileName("bruh"); err != nil {
+		time.Sleep(2 * time.Second)
+		if err := openDialog.SetFileName("hello world"); err != nil {
 			panic(err)
 		}
 	}()

cfd/CommonFileDialog.go

@@ -7,6 +7,8 @@ type Dialog interface {
 	// Show the dialog to the user.
 	// Blocks until the user has closed the dialog.
 	Show() error
+	// Sets the dialog's parent window. Use 0 to set the dialog to have no parent window.
+	SetParentWindowHandle(hwnd uintptr)
 	// Show the dialog to the user.
 	// Blocks until the user has closed the dialog and returns their selection.
 	// Returns an error if the user cancelled the dialog.

cfd/CommonFileDialog_nonWindows.go

@@ -6,18 +6,22 @@ import "fmt"
 
 var unsupportedError = fmt.Errorf("common file dialogs are only available on windows")
 
+// TODO doc
 func NewOpenFileDialog(config DialogConfig) (OpenFileDialog, error) {
 	return nil, unsupportedError
 }
 
+// TODO doc
 func NewOpenMultipleFilesDialog(config DialogConfig) (OpenMultipleFilesDialog, error) {
 	return nil, unsupportedError
 }
 
+// TODO doc
 func NewSelectFolderDialog(config DialogConfig) (SelectFolderDialog, error) {
 	return nil, unsupportedError
 }
 
+// TODO doc
 func NewSaveFileDialog(config DialogConfig) (SaveFileDialog, error) {
 	return nil, unsupportedError
 }

cfd/CommonFileDialog_windows.go

@@ -4,13 +4,14 @@ package cfd
 
 import "github.com/go-ole/go-ole"
 
-func Initialize() {
+func initialize() {
 	// Swallow error
 	_ = ole.CoInitializeEx(0, ole.COINIT_APARTMENTTHREADED|ole.COINIT_DISABLE_OLE1DDE)
 }
 
+// TODO doc
 func NewOpenFileDialog(config DialogConfig) (OpenFileDialog, error) {
-	Initialize()
+	initialize()
 
 	openDialog, err := newIFileOpenDialog()
 	if err != nil {
@@ -23,8 +24,9 @@ func NewOpenFileDialog(config DialogConfig) (OpenFileDialog, error) {
 	return openDialog, nil
 }
 
+// TODO doc
 func NewOpenMultipleFilesDialog(config DialogConfig) (OpenMultipleFilesDialog, error) {
-	Initialize()
+	initialize()
 
 	openDialog, err := newIFileOpenDialog()
 	if err != nil {
@@ -41,8 +43,9 @@ func NewOpenMultipleFilesDialog(config DialogConfig) (OpenMultipleFilesDialog, e
 	return openDialog, nil
 }
 
+// TODO doc
 func NewSelectFolderDialog(config DialogConfig) (SelectFolderDialog, error) {
-	Initialize()
+	initialize()
 
 	openDialog, err := newIFileOpenDialog()
 	if err != nil {
@@ -59,8 +62,9 @@ func NewSelectFolderDialog(config DialogConfig) (SelectFolderDialog, error) {
 	return openDialog, nil
 }
 
+// TODO doc
 func NewSaveFileDialog(config DialogConfig) (SaveFileDialog, error) {
-	Initialize()
+	initialize()
 
 	saveDialog, err := newIFileSaveDialog()
 	if err != nil {

cfd/DialogConfig.go

@@ -39,6 +39,9 @@ type DialogConfig struct {
 	// For Save File Dialog, this extension will be used whenever a user does not specify an extension.
 	// Ignored by Select Folder Dialog.
 	DefaultExtension string
+	// ParentWindowHandle is the handle (HWND) to the parent window of the dialog.
+	// If left as 0 / nil, the dialog will have no parent window.
+	ParentWindowHandle uintptr
 }
 
 var defaultFilters = []FileFilter{
@@ -84,6 +87,8 @@ func (config *DialogConfig) apply(dialog Dialog) (err error) {
 		}
 	}
 
+	dialog.SetParentWindowHandle(config.ParentWindowHandle)
+
 	if dialog, ok := dialog.(FileDialog); ok {
 		var fileFilters []FileFilter
 		if config.FileFilters != nil && len(config.FileFilters) > 0 {

cfd/iFileOpenDialog.go

@@ -17,7 +17,8 @@ var (
 )
 
 type iFileOpenDialog struct {
-	vtbl *iFileOpenDialogVtbl
+	vtbl               *iFileOpenDialogVtbl
+	parentWindowHandle uintptr
 }
 
 type iFileOpenDialogVtbl struct {
@@ -36,7 +37,11 @@ func newIFileOpenDialog() (*iFileOpenDialog, error) {
 }
 
 func (fileOpenDialog *iFileOpenDialog) Show() error {
-	return fileOpenDialog.vtbl.show(unsafe.Pointer(fileOpenDialog))
+	return fileOpenDialog.vtbl.show(unsafe.Pointer(fileOpenDialog), fileOpenDialog.parentWindowHandle)
+}
+
+func (fileOpenDialog *iFileOpenDialog) SetParentWindowHandle(hwnd uintptr) {
+	fileOpenDialog.parentWindowHandle = hwnd
 }
 
 func (fileOpenDialog *iFileOpenDialog) ShowAndGetResult() (string, error) {

cfd/iFileSaveDialog.go

@@ -14,7 +14,8 @@ var (
 )
 
 type iFileSaveDialog struct {
-	vtbl *iFileSaveDialogVtbl
+	vtbl               *iFileSaveDialogVtbl
+	parentWindowHandle uintptr
 }
 
 type iFileSaveDialogVtbl struct {
@@ -36,7 +37,11 @@ func newIFileSaveDialog() (*iFileSaveDialog, error) {
 }
 
 func (fileSaveDialog *iFileSaveDialog) Show() error {
-	return fileSaveDialog.vtbl.show(unsafe.Pointer(fileSaveDialog))
+	return fileSaveDialog.vtbl.show(unsafe.Pointer(fileSaveDialog), fileSaveDialog.parentWindowHandle)
+}
+
+func (fileSaveDialog *iFileSaveDialog) SetParentWindowHandle(hwnd uintptr) {
+	fileSaveDialog.parentWindowHandle = hwnd
 }
 
 func (fileSaveDialog *iFileSaveDialog) ShowAndGetResult() (string, error) {

cfd/vtblCommonFunc.go

@@ -26,11 +26,11 @@ func (vtbl *iUnknownVtbl) release(objPtr unsafe.Pointer) error {
 	return hresultToError(ret)
 }
 
-func (vtbl *iModalWindowVtbl) show(objPtr unsafe.Pointer) error {
+func (vtbl *iModalWindowVtbl) show(objPtr unsafe.Pointer, hwnd uintptr) error {
 	ret, _, _ := syscall.Syscall(vtbl.Show,
-		1, // First argument is owner hWnd, we are just passing null
+		1,
 		uintptr(objPtr),
-		0,
+		hwnd,
 		0)
 	return hresultToError(ret)
 }

cfdutil/CFDUtil.go

@@ -1,11 +1,10 @@
-// +build windows
-
 package cfdutil
 
 import (
 	"github.com/harry1453/go-common-file-dialog/cfd"
 )
 
+// TODO doc
 func ShowOpenFileDialog(config cfd.DialogConfig) (string, error) {
 	dialog, err := cfd.NewOpenFileDialog(config)
 	if err != nil {
@@ -15,6 +14,7 @@ func ShowOpenFileDialog(config cfd.DialogConfig) (string, error) {
 	return dialog.ShowAndGetResult()
 }
 
+// TODO doc
 func ShowOpenMultipleFilesDialog(config cfd.DialogConfig) ([]string, error) {
 	dialog, err := cfd.NewOpenMultipleFilesDialog(config)
 	if err != nil {
@@ -24,6 +24,7 @@ func ShowOpenMultipleFilesDialog(config cfd.DialogConfig) ([]string, error) {
 	return dialog.ShowAndGetResults()
 }
 
+// TODO doc
 func ShowPickFolderDialog(config cfd.DialogConfig) (string, error) {
 	dialog, err := cfd.NewSelectFolderDialog(config)
 	if err != nil {
@@ -33,6 +34,7 @@ func ShowPickFolderDialog(config cfd.DialogConfig) (string, error) {
 	return dialog.ShowAndGetResult()
 }
 
+// TODO doc
 func ShowSaveFileDialog(config cfd.DialogConfig) (string, error) {
 	dialog, err := cfd.NewSaveFileDialog(config)
 	if err != nil {