From da55f4c16d0e6b93783332842d0f01750f0b524c Mon Sep 17 00:00:00 2001 From: eeeXun Date: Sun, 23 Oct 2022 15:41:28 +0800 Subject: [PATCH] move AddItem to ui --- main.go | 19 ------------------- ui.go | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/main.go b/main.go index a120283..a1244ce 100644 --- a/main.go +++ b/main.go @@ -32,25 +32,6 @@ func main() { configInit() window.colorInit() uiInit() - translateWindow.SetDirection(tview.FlexColumn). - AddItem(srcBox, 0, 1, true). - AddItem(dstBox, 0, 1, false) - langWindow.SetDirection(tview.FlexRow). - AddItem(nil, 0, 1, false). - AddItem(tview.NewFlex().SetDirection(tview.FlexColumn). - AddItem(nil, 0, 1, false). - AddItem(srcDropDown, 32, 1, true). - AddItem(dstDropDown, 32, 1, false). - AddItem(nil, 0, 1, false), 20, 1, true). - AddItem(tview.NewFlex().SetDirection(tview.FlexColumn). - AddItem(nil, 0, 1, false). - AddItem(langButton, 11, 1, true). - AddItem(nil, 18, 1, false). - AddItem(styleButton, 8, 1, true). - AddItem(nil, 18, 1, false). - AddItem(menuButton, 9, 1, true). - AddItem(nil, 0, 1, false), 1, 1, true). - AddItem(nil, 0, 1, false) mainPage.AddPage("translatePage", translateWindow, true, true) mainPage.AddPage("langPage", langWindow, true, false) diff --git a/ui.go b/ui.go index e719821..e4cb80e 100644 --- a/ui.go +++ b/ui.go @@ -2,6 +2,7 @@ package main import ( "github.com/gdamore/tcell/v2" + "github.com/rivo/tview" ) func updateBackground() { @@ -41,6 +42,17 @@ func updateTitle() { dstDropDown.SetTitle(translator.dstLang) } +func attachButton() *tview.Flex { + return tview.NewFlex().SetDirection(tview.FlexColumn). + AddItem(nil, 0, 1, false). + AddItem(langButton, 11, 1, true). + AddItem(nil, 18, 1, false). + AddItem(styleButton, 8, 1, true). + AddItem(nil, 18, 1, false). + AddItem(menuButton, 9, 1, true). + AddItem(nil, 0, 1, false) +} + func uiInit() { // box srcBox.SetBorder(true). @@ -89,6 +101,20 @@ func uiInit() { updateBackground() updateTitle() + // window + translateWindow.SetDirection(tview.FlexColumn). + AddItem(srcBox, 0, 1, true). + AddItem(dstBox, 0, 1, false) + langWindow.SetDirection(tview.FlexRow). + AddItem(nil, 0, 1, false). + AddItem(tview.NewFlex().SetDirection(tview.FlexColumn). + AddItem(nil, 0, 1, false). + AddItem(srcDropDown, 32, 1, true). + AddItem(dstDropDown, 32, 1, false). + AddItem(nil, 0, 1, false), 20, 1, true). + AddItem(attachButton(), 1, 1, true). + AddItem(nil, 0, 1, false) + // handler mainPage.SetInputCapture(pagesHandler) translateWindow.SetInputCapture(translatePageHandler)