use panels as root

treethought · Sep 11, 2021 · 5089f2b · 5089f2b
1 parent 7d48b0f
commit 5089f2b
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 39 deletions.
diff --git a/ui/files.go b/ui/files.go
@@ -61,7 +61,7 @@ func NewRepoTree(app *App) *RepoTree {
 		TreeView: cview.NewTreeView(),
 		app:      app,
 	}
-	m.SetBorder(false)
+	m.SetBorder(true)
 	m.SetPadding(1, 1, 1, 1)
 	m.SetTitle("repo")
 	m.SetBackgroundColor(tcell.ColorDefault)

diff --git a/ui/ui.go b/ui/ui.go
@@ -12,8 +12,7 @@ import (
 type App struct {
 	ipfs         *ipfs.Client
 	ui           *cview.Application
-	root         *cview.Flex
-	dataPanels   *cview.TabbedPanels
+	root         *cview.TabbedPanels
 	focusManager *cview.FocusManager
 	state        *State
 	widgets      []Widget
@@ -52,53 +51,77 @@ func New() *App {
 	return app
 }
 
-func (app *App) initViews() {
+func (app *App) initFilesLayout() *cview.Flex {
 	repo := NewRepoTree(app)
 	info := NewFileInfo(app)
 	dag := NewDagInfo(app)
 	content := NewContentView(app)
+	app.widgets = append(app.widgets, repo, info, dag, content)
 
-	peers := NewPeerList(app)
-
-	app.widgets = append(app.widgets, repo, info, dag, content, peers)
-
-	dataPanels := cview.NewTabbedPanels()
-	dataPanels.AddTab("files", "files", repo)
-	dataPanels.AddTab("peers", "peers", peers)
-
-	dataPanels.SetBackgroundColor(tcell.ColorDefault)
-	dataPanels.SetTabBackgroundColor(tcell.ColorDefault)
-	dataPanels.SetTabSwitcherDivider("", " | ", "")
-	dataPanels.SetTabSwitcherAfterContent(true)
-	// dataPanels.SetDirection(cview.FlexColumn)
-	dataPanels.SetBorder(true)
-
-	app.dataPanels = dataPanels
-	// app.dataPanels.AddItem(app.repo, 0, 4, true)
+	// side panel of file tree and info
+	side := cview.NewFlex()
+	side.SetBackgroundTransparent(false)
+	side.SetBackgroundColor(tcell.ColorDefault)
+	side.SetDirection(cview.FlexRow)
+	side.AddItem(repo, 0, 2, true)
+	side.AddItem(info, 0, 1, false)
 
+	// larger main content and dag explorer
 	mid := cview.NewFlex()
+	mid.SetBackgroundTransparent(false)
 	mid.SetBackgroundColor(tcell.ColorDefault)
 	mid.SetDirection(cview.FlexRow)
-	// mid.AddItem(app.dataPanels, 0, 4, true)
-	mid.AddItem(content, 0, 4, false)
-	// mid.AddItem(app.info, 0, 2, false)
-	mid.AddItem(dag, 0, 2, false)
+	mid.AddItem(content, 0, 2, false)
+	mid.AddItem(dag, 0, 1, false)
 
+	// wrapping cotainer
 	flex := cview.NewFlex()
 	flex.SetBackgroundTransparent(false)
 	flex.SetBackgroundColor(tcell.ColorDefault)
-
-	left := cview.NewFlex()
-	left.SetDirection(cview.FlexRow)
-	// left.AddItem(app.repo, 0, 7, false)
-	left.AddItem(app.dataPanels, 0, 4, false)
-	left.AddItem(info, 0, 2, false)
-
-	flex.AddItem(left, 0, 2, false)
+	flex.AddItem(side, 0, 2, true)
 	flex.AddItem(mid, 0, 4, false)
-	app.root = flex
 
 	app.initInputHandler(repo, content, dag, info)
+	return flex
+
+}
+func (app *App) initPeersLayout() *cview.Flex {
+	peers := NewPeerList(app)
+	app.widgets = append(app.widgets, peers)
+
+	flex := cview.NewFlex()
+	flex.SetBackgroundTransparent(false)
+	flex.SetBackgroundColor(tcell.ColorDefault)
+
+	side := cview.NewFlex()
+	side.SetBackgroundTransparent(false)
+	side.SetBackgroundColor(tcell.ColorDefault)
+	side.AddItem(peers, 0, 2, true)
+
+	flex.AddItem(side, 0, 2, true)
+
+	return flex
+}
+
+func (app *App) initViews() {
+
+	filesFlex := app.initFilesLayout()
+	peersFlex := app.initPeersLayout()
+
+	dataPanels := cview.NewTabbedPanels()
+	dataPanels.SetTitle("panels")
+	dataPanels.AddTab("files", "files", filesFlex)
+	dataPanels.AddTab("peers", "peers", peersFlex)
+	dataPanels.SetCurrentTab("files")
+	dataPanels.SetBorder(false)
+	dataPanels.SetPadding(0, 0, 0, 0)
+
+	dataPanels.SetBackgroundColor(tcell.ColorDefault)
+	dataPanels.SetTabBackgroundColor(tcell.ColorDefault)
+	dataPanels.SetTabSwitcherDivider("", " | ", "")
+	dataPanels.SetTabSwitcherAfterContent(true)
+
+	app.root = dataPanels
 
 }
 
@@ -111,20 +134,19 @@ func (app *App) handleToggle(ev *tcell.EventKey) *tcell.EventKey {
 func (app *App) initBindings() {
 	c := cbind.NewConfiguration()
 	c.SetKey(tcell.ModNone, tcell.KeyTAB, app.handleToggle)
-	c.SetKey(tcell.ModNone, tcell.KeyF1, app.handleToggle)
 	c.SetRune(tcell.ModNone, '1', func(ev *tcell.EventKey) *tcell.EventKey {
-		app.dataPanels.SetCurrentTab("files")
+		app.root.SetCurrentTab("files")
 		return nil
 	})
 	c.SetRune(tcell.ModNone, '2', func(ev *tcell.EventKey) *tcell.EventKey {
-		app.dataPanels.SetCurrentTab("peers")
+		app.root.SetCurrentTab("peers")
 		return nil
 	})
 	app.ui.SetInputCapture(c.Capture)
 }
 
 func (app *App) initInputHandler(widgets ...cview.Primitive) {
-	widgets = append(widgets, app.dataPanels)
+	widgets = append(widgets)
 	app.focusManager = cview.NewFocusManager(app.ui.SetFocus)
 	app.focusManager.SetWrapAround(true)
 	app.focusManager.Add(widgets...)
@@ -139,7 +161,6 @@ func (app *App) Start() {
 	app.initBindings()
 
 	app.ui.SetRoot(app.root, true)
-	app.ui.SetFocus(app.dataPanels)
 
 	app.ui.EnableMouse(true)