github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-28 22:08:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Correct infobar and statusline options

Browse Source
This commit is contained in:
Zachary Yedidia
2019-01-14 22:16:44 -05:00
parent 055fff2b08
commit 812c7761dc
8 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/micro/action/actions.go
View File

@@ -1046,8 +1046,9 @@ func (h *BufHandler) QuitAll() bool {
// AddTab adds a new tab with an empty buffer
func (h *BufHandler) AddTab() bool {
width, height := screen.Screen.Size()
iOffset := config.GetInfoBarOffset()
b := buffer.NewBufferFromString("", "", buffer.BTDefault)
tp := NewTabFromBuffer(0, 0, width, height-1, b)
tp := NewTabFromBuffer(0, 0, width, height-iOffset, b)
Tabs.AddTab(tp)
Tabs.SetActive(len(Tabs.List) - 1)

13
cmd/micro/action/command.go
View File

@@ -352,6 +352,7 @@ func (h *BufHandler) EvalCmd(args []string) {
// NewTabCmd opens the given file in a new tab
func (h *BufHandler) NewTabCmd(args []string) {
width, height := screen.Screen.Size()
iOffset := config.GetInfoBarOffset()
if len(args) > 0 {
for _, a := range args {
b, err := buffer.NewBufferFromFile(a, buffer.BTDefault)
@@ -359,13 +360,13 @@ func (h *BufHandler) NewTabCmd(args []string) {
InfoBar.Error(err)
return
}
tp := NewTabFromBuffer(0, 0, width, height-1, b)
tp := NewTabFromBuffer(0, 0, width, height-1-iOffset, b)
Tabs.AddTab(tp)
Tabs.SetActive(len(Tabs.List) - 1)
}
} else {
b := buffer.NewBufferFromString("", "", buffer.BTDefault)
tp := NewTabFromBuffer(0, 0, width, height-1, b)
tp := NewTabFromBuffer(0, 0, width, height-iOffset, b)
Tabs.AddTab(tp)
Tabs.SetActive(len(Tabs.List) - 1)
}
@@ -392,11 +393,9 @@ func SetGlobalOption(option, value string) error {
}
// TODO: info and keymenu option change
// if option == "infobar" || option == "keymenu" {
// for _, tab := range tabs {
// tab.Resize()
// }
// }
if option == "infobar" || option == "keymenu" {
Tabs.Resize()
}
if option == "mouse" {
if !nativeValue.(bool) {

11
cmd/micro/action/tab.go
View File

@@ -2,6 +2,7 @@ package action
import (
"github.com/zyedidia/micro/cmd/micro/buffer"
"github.com/zyedidia/micro/cmd/micro/config"
"github.com/zyedidia/micro/cmd/micro/display"
"github.com/zyedidia/micro/cmd/micro/screen"
"github.com/zyedidia/micro/cmd/micro/views"
@@ -19,14 +20,15 @@ type TabList struct {
// for each buffer
func NewTabList(bufs []*buffer.Buffer) *TabList {
w, h := screen.Screen.Size()
iOffset := config.GetInfoBarOffset()
tl := new(TabList)
tl.List = make([]*Tab, len(bufs))
if len(bufs) > 1 {
for i, b := range bufs {
tl.List[i] = NewTabFromBuffer(0, 1, w, h-2, b)
tl.List[i] = NewTabFromBuffer(0, 1, w, h-1-iOffset, b)
}
} else {
tl.List[0] = NewTabFromBuffer(0, 0, w, h-1, bufs[0])
tl.List[0] = NewTabFromBuffer(0, 0, w, h-iOffset, bufs[0])
}
tl.TabWindow = display.NewTabWindow(w, 0)
tl.Names = make([]string, len(bufs))
@@ -76,16 +78,17 @@ func (t *TabList) RemoveTab(id uint64) {
// that into account
func (t *TabList) Resize() {
w, h := screen.Screen.Size()
iOffset := config.GetInfoBarOffset()
InfoBar.Resize(w, h-1)
if len(t.List) > 1 {
for _, p := range t.List {
p.Y = 1
p.Node.Resize(w, h-2)
p.Node.Resize(w, h-1-iOffset)
p.Resize()
}
} else if len(t.List) == 1 {
t.List[0].Y = 0
t.List[0].Node.Resize(w, h-1)
t.List[0].Node.Resize(w, h-iOffset)
t.List[0].Resize()
}
}