diff --git a/cmd/gosdn-tview/views/commandsListView.go b/cmd/gosdn-tview/views/commandsListView.go index e69223dfa28e030627b1e0fed63a5b2f1881f8ba..31c18ff658d70802810cb7a50e0f465dda207eb0 100644 --- a/cmd/gosdn-tview/views/commandsListView.go +++ b/cmd/gosdn-tview/views/commandsListView.go @@ -11,10 +11,10 @@ type CommandListView struct { } func NewCommandListView(rootTitle string) *CommandListView { - - v := &CommandListView{} - v.rootNode = tview.NewTreeNode(rootTitle) - v.commandsTree = tview.NewTreeView() + v := &CommandListView{ + rootNode: tview.NewTreeNode(rootTitle), + commandsTree: tview.NewTreeView(), + } v.commandsTree. SetRoot(v.rootNode). SetTitle("Commands"). diff --git a/cmd/gosdn-tview/views/mainView.go b/cmd/gosdn-tview/views/mainView.go index 8db872954559445cd4d6881537ae2a0abc7042dc..a543399062c8b06ed6eb6e0bb683b918d7950477 100644 --- a/cmd/gosdn-tview/views/mainView.go +++ b/cmd/gosdn-tview/views/mainView.go @@ -10,14 +10,14 @@ type MainView struct { } func NewMainView() *MainView { - v := &MainView{} - v.pages = tview.NewPages() - v.resultAndInputView = NewResultAndInputView() - v.commandsListView = NewCommandListView("") + v := &MainView{ + pages: tview.NewPages(), + mainFlexBox: createFlexBox(tview.FlexColumn), + commandsListView: NewCommandListView(""), + resultAndInputView: NewResultAndInputView(), + } v.commandsListView.GetCommands("../") - v.mainFlexBox = createFlexBox(tview.FlexColumn) - commandsFlexBox := createFlexBox(tview.FlexRow) commandsFlexBox.AddItem(v.commandsListView.GetContent(), 0, 40, true) diff --git a/cmd/gosdn-tview/views/resultAndInputView.go b/cmd/gosdn-tview/views/resultAndInputView.go index b16b10427aadd19ffb5d8963ff2131ca17cd5337..89e9d77ba88578437cb6827bab48aafd85e8d2c2 100644 --- a/cmd/gosdn-tview/views/resultAndInputView.go +++ b/cmd/gosdn-tview/views/resultAndInputView.go @@ -10,8 +10,9 @@ type ResultAndInputView struct { } func NewResultAndInputView() *ResultAndInputView { - v := &ResultAndInputView{} - v.resultAndInputView = tview.NewTextView() + v := &ResultAndInputView{ + resultAndInputView: tview.NewTextView(), + } v.resultAndInputView. SetDynamicColors(true). SetRegions(true).