From 92cc4847d66e11e593a082ea5dfacb4dc7d534d8 Mon Sep 17 00:00:00 2001 From: zjzhang Date: Wed, 30 Oct 2024 11:26:10 +0800 Subject: [PATCH] Fix EntryNavItem constructor function --- example/basic/home.go | 2 +- explorer/tree_style.go | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/example/basic/home.go b/example/basic/home.go index fef296f..0595a53 100644 --- a/example/basic/home.go +++ b/example/basic/home.go @@ -114,7 +114,7 @@ func newHome(window *app.Window) *HomeView { sidebar.AddSection(navi.SimpleItemSection(viewIcon, "Editor Example", EditorExampleViewID, false)) sidebar.AddSection(navi.SimpleItemSection(viewIcon, "File Explorer", ExplorerViewID, false)) - fileTree := explorer.NewEntryNavItem("../../", nil, nil) + fileTree, _ := explorer.NewEntryNavItem("../../", nil, nil) sidebar.AddSection(explorer.NewFileTreeNav(sidebar, "File Explorer", fileTree)) vm.Register(ExampleViewID, func() view.View { return NewExampleView(vm) }) diff --git a/explorer/tree_style.go b/explorer/tree_style.go index 87dbae4..f3d9327 100644 --- a/explorer/tree_style.go +++ b/explorer/tree_style.go @@ -86,20 +86,12 @@ func (tn *FileTreeNav) Layout(gtx C, th *theme.Theme) D { } // Construct a file tree object that loads files and folders from rootDir. -// `skipFolders` allows you to specify folder name prefixes to exclude from the navigation. // `menuOptionFunc` is used to define the operations allowed by context menu(use right click to active it). // `onSelectFunc` defines what action to take when a navigable item is clicked (files or folders). -func NewEntryNavItem(rootDir string, menuOptionFunc MenuOptionFunc, onSelectFunc OnSelectFunc) *EntryNavItem { +func NewEntryNavItem(rootDir string, menuOptionFunc MenuOptionFunc, onSelectFunc OnSelectFunc) (*EntryNavItem, error) { tree, err := NewFileTree(rootDir) if err != nil { - log.Fatal(err) - } - - //tree.Print() - - if err != nil { - log.Println("load file tree failed", err) - return nil + return nil, err } return &EntryNavItem{ @@ -108,7 +100,7 @@ func NewEntryNavItem(rootDir string, menuOptionFunc MenuOptionFunc, onSelectFunc menuOptionFunc: menuOptionFunc, onSelectFunc: onSelectFunc, expaned: true, - } + }, nil }