mirror of
https://github.com/makew0rld/amfora.git
synced 2024-09-27 23:05:55 -04:00
Make theme and tabs work/look like with old cview
This commit is contained in:
parent
86f9f0f329
commit
e1a92a999a
@ -32,6 +32,8 @@ func bkmkInit() {
|
|||||||
form.SetLabelColor(config.GetColor("bkmk_modal_label"))
|
form.SetLabelColor(config.GetColor("bkmk_modal_label"))
|
||||||
form.SetFieldBackgroundColor(config.GetColor("bkmk_modal_field_bg"))
|
form.SetFieldBackgroundColor(config.GetColor("bkmk_modal_field_bg"))
|
||||||
form.SetFieldTextColor(config.GetColor("bkmk_modal_field_text"))
|
form.SetFieldTextColor(config.GetColor("bkmk_modal_field_text"))
|
||||||
|
form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
|
||||||
|
form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
|
||||||
frame := m.GetFrame()
|
frame := m.GetFrame()
|
||||||
frame.SetBorderColor(config.GetColor("bkmk_modal_text"))
|
frame.SetBorderColor(config.GetColor("bkmk_modal_text"))
|
||||||
frame.SetTitleColor(config.GetColor("bkmk_modal_text"))
|
frame.SetTitleColor(config.GetColor("bkmk_modal_text"))
|
||||||
@ -44,6 +46,8 @@ func bkmkInit() {
|
|||||||
form.SetLabelColor(tcell.ColorWhite)
|
form.SetLabelColor(tcell.ColorWhite)
|
||||||
form.SetFieldBackgroundColor(tcell.ColorWhite)
|
form.SetFieldBackgroundColor(tcell.ColorWhite)
|
||||||
form.SetFieldTextColor(tcell.ColorBlack)
|
form.SetFieldTextColor(tcell.ColorBlack)
|
||||||
|
form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
|
||||||
|
form.SetButtonTextColorFocused(tcell.ColorWhite)
|
||||||
frame := m.GetFrame()
|
frame := m.GetFrame()
|
||||||
frame.SetBorderColor(tcell.ColorWhite)
|
frame.SetBorderColor(tcell.ColorWhite)
|
||||||
frame.SetTitleColor(tcell.ColorWhite)
|
frame.SetTitleColor(tcell.ColorWhite)
|
||||||
|
@ -110,6 +110,7 @@ func Init(version, commit, builtBy string) {
|
|||||||
fmt.Sprintf("[%s:%s]|[-]", config.GetColorString("tab_divider"), config.GetColorString("bg")),
|
fmt.Sprintf("[%s:%s]|[-]", config.GetColorString("tab_divider"), config.GetColorString("bg")),
|
||||||
fmt.Sprintf("[%s:%s]|[-]", config.GetColorString("tab_divider"), config.GetColorString("bg")),
|
fmt.Sprintf("[%s:%s]|[-]", config.GetColorString("tab_divider"), config.GetColorString("bg")),
|
||||||
)
|
)
|
||||||
|
browser.Switcher.SetBackgroundColor(config.GetColor("bg"))
|
||||||
} else {
|
} else {
|
||||||
bottomBar.SetBackgroundColor(tcell.ColorWhite)
|
bottomBar.SetBackgroundColor(tcell.ColorWhite)
|
||||||
bottomBar.SetLabelColor(tcell.ColorBlack)
|
bottomBar.SetLabelColor(tcell.ColorBlack)
|
||||||
@ -435,7 +436,7 @@ func NewTab() {
|
|||||||
tabs[curTab].addToHistory("about:newtab")
|
tabs[curTab].addToHistory("about:newtab")
|
||||||
tabs[curTab].history.pos = 0 // Manually set as first page
|
tabs[curTab].history.pos = 0 // Manually set as first page
|
||||||
|
|
||||||
browser.AddTab(strconv.Itoa(curTab), strconv.Itoa(curTab+1), tabs[curTab].view)
|
browser.AddTab(strconv.Itoa(curTab), makeTabLabel(strconv.Itoa(curTab+1)), tabs[curTab].view)
|
||||||
browser.SetCurrentTab(strconv.Itoa(curTab))
|
browser.SetCurrentTab(strconv.Itoa(curTab))
|
||||||
App.SetFocus(tabs[curTab].view)
|
App.SetFocus(tabs[curTab].view)
|
||||||
|
|
||||||
|
@ -43,6 +43,9 @@ func dlInit() {
|
|||||||
chm.SetButtonTextColor(config.GetColor("btn_text"))
|
chm.SetButtonTextColor(config.GetColor("btn_text"))
|
||||||
chm.SetBackgroundColor(config.GetColor("dl_choice_modal_bg"))
|
chm.SetBackgroundColor(config.GetColor("dl_choice_modal_bg"))
|
||||||
chm.SetTextColor(config.GetColor("dl_choice_modal_text"))
|
chm.SetTextColor(config.GetColor("dl_choice_modal_text"))
|
||||||
|
form := chm.GetForm()
|
||||||
|
form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
|
||||||
|
form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
|
||||||
frame := chm.GetFrame()
|
frame := chm.GetFrame()
|
||||||
frame.SetBorderColor(config.GetColor("dl_choice_modal_text"))
|
frame.SetBorderColor(config.GetColor("dl_choice_modal_text"))
|
||||||
frame.SetTitleColor(config.GetColor("dl_choice_modal_text"))
|
frame.SetTitleColor(config.GetColor("dl_choice_modal_text"))
|
||||||
@ -51,6 +54,9 @@ func dlInit() {
|
|||||||
dlm.SetButtonTextColor(config.GetColor("btn_text"))
|
dlm.SetButtonTextColor(config.GetColor("btn_text"))
|
||||||
dlm.SetBackgroundColor(config.GetColor("dl_modal_bg"))
|
dlm.SetBackgroundColor(config.GetColor("dl_modal_bg"))
|
||||||
dlm.SetTextColor(config.GetColor("dl_modal_text"))
|
dlm.SetTextColor(config.GetColor("dl_modal_text"))
|
||||||
|
form = dlm.GetForm()
|
||||||
|
form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
|
||||||
|
form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
|
||||||
frame = dlm.GetFrame()
|
frame = dlm.GetFrame()
|
||||||
frame.SetBorderColor(config.GetColor("dl_modal_text"))
|
frame.SetBorderColor(config.GetColor("dl_modal_text"))
|
||||||
frame.SetTitleColor(config.GetColor("dl_modal_text"))
|
frame.SetTitleColor(config.GetColor("dl_modal_text"))
|
||||||
@ -59,13 +65,19 @@ func dlInit() {
|
|||||||
chm.SetButtonTextColor(tcell.ColorBlack)
|
chm.SetButtonTextColor(tcell.ColorBlack)
|
||||||
chm.SetBackgroundColor(tcell.ColorBlack)
|
chm.SetBackgroundColor(tcell.ColorBlack)
|
||||||
chm.SetTextColor(tcell.ColorWhite)
|
chm.SetTextColor(tcell.ColorWhite)
|
||||||
dlChoiceModal.SetBorderColor(tcell.ColorWhite)
|
chm.SetBorderColor(tcell.ColorWhite)
|
||||||
dlChoiceModal.GetFrame().SetTitleColor(tcell.ColorWhite)
|
chm.GetFrame().SetTitleColor(tcell.ColorWhite)
|
||||||
|
form := chm.GetForm()
|
||||||
|
form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
|
||||||
|
form.SetButtonTextColorFocused(tcell.ColorWhite)
|
||||||
|
|
||||||
dlm.SetButtonBackgroundColor(tcell.ColorWhite)
|
dlm.SetButtonBackgroundColor(tcell.ColorWhite)
|
||||||
dlm.SetButtonTextColor(tcell.ColorBlack)
|
dlm.SetButtonTextColor(tcell.ColorBlack)
|
||||||
dlm.SetBackgroundColor(tcell.ColorBlack)
|
dlm.SetBackgroundColor(tcell.ColorBlack)
|
||||||
dlm.SetTextColor(tcell.ColorWhite)
|
dlm.SetTextColor(tcell.ColorWhite)
|
||||||
|
form = dlm.GetForm()
|
||||||
|
form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
|
||||||
|
form.SetButtonTextColorFocused(tcell.ColorWhite)
|
||||||
frame := dlm.GetFrame()
|
frame := dlm.GetFrame()
|
||||||
frame.SetBorderColor(tcell.ColorWhite)
|
frame.SetBorderColor(tcell.ColorWhite)
|
||||||
frame.SetTitleColor(tcell.ColorWhite)
|
frame.SetTitleColor(tcell.ColorWhite)
|
||||||
|
@ -95,7 +95,7 @@ func handleFavicon(t *tab, host string) {
|
|||||||
defer func() {
|
defer func() {
|
||||||
// Update display if needed
|
// Update display if needed
|
||||||
if t.page.Favicon != "" && isValidTab(t) {
|
if t.page.Favicon != "" && isValidTab(t) {
|
||||||
browser.SetTabLabel(strconv.Itoa(tabNumber(t)), t.page.Favicon)
|
browser.SetTabLabel(strconv.Itoa(tabNumber(t)), makeTabLabel(t.page.Favicon))
|
||||||
App.Draw()
|
App.Draw()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
@ -47,6 +47,9 @@ func modalInit() {
|
|||||||
m.SetButtonBackgroundColor(config.GetColor("btn_bg"))
|
m.SetButtonBackgroundColor(config.GetColor("btn_bg"))
|
||||||
m.SetButtonTextColor(config.GetColor("btn_text"))
|
m.SetButtonTextColor(config.GetColor("btn_text"))
|
||||||
m.SetTextColor(config.GetColor("info_modal_text"))
|
m.SetTextColor(config.GetColor("info_modal_text"))
|
||||||
|
form := m.GetForm()
|
||||||
|
form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
|
||||||
|
form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
|
||||||
frame := m.GetFrame()
|
frame := m.GetFrame()
|
||||||
frame.SetBorderColor(config.GetColor("info_modal_text"))
|
frame.SetBorderColor(config.GetColor("info_modal_text"))
|
||||||
frame.SetTitleColor(config.GetColor("info_modal_text"))
|
frame.SetTitleColor(config.GetColor("info_modal_text"))
|
||||||
@ -56,6 +59,9 @@ func modalInit() {
|
|||||||
m.SetButtonBackgroundColor(config.GetColor("btn_bg"))
|
m.SetButtonBackgroundColor(config.GetColor("btn_bg"))
|
||||||
m.SetButtonTextColor(config.GetColor("btn_text"))
|
m.SetButtonTextColor(config.GetColor("btn_text"))
|
||||||
m.SetTextColor(config.GetColor("error_modal_text"))
|
m.SetTextColor(config.GetColor("error_modal_text"))
|
||||||
|
form = m.GetForm()
|
||||||
|
form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
|
||||||
|
form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
|
||||||
frame = errorModal.GetFrame()
|
frame = errorModal.GetFrame()
|
||||||
frame.SetBorderColor(config.GetColor("error_modal_text"))
|
frame.SetBorderColor(config.GetColor("error_modal_text"))
|
||||||
frame.SetTitleColor(config.GetColor("error_modal_text"))
|
frame.SetTitleColor(config.GetColor("error_modal_text"))
|
||||||
@ -68,19 +74,27 @@ func modalInit() {
|
|||||||
frame = inputModal.GetFrame()
|
frame = inputModal.GetFrame()
|
||||||
frame.SetBorderColor(config.GetColor("input_modal_text"))
|
frame.SetBorderColor(config.GetColor("input_modal_text"))
|
||||||
frame.SetTitleColor(config.GetColor("input_modal_text"))
|
frame.SetTitleColor(config.GetColor("input_modal_text"))
|
||||||
form := inputModal.GetForm()
|
form = inputModal.GetForm()
|
||||||
form.SetFieldBackgroundColor(config.GetColor("input_modal_field_bg"))
|
form.SetFieldBackgroundColor(config.GetColor("input_modal_field_bg"))
|
||||||
form.SetFieldTextColor(config.GetColor("input_modal_field_text"))
|
form.SetFieldTextColor(config.GetColor("input_modal_field_text"))
|
||||||
|
form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
|
||||||
|
form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
|
||||||
|
|
||||||
m = yesNoModal
|
m = yesNoModal
|
||||||
m.SetButtonBackgroundColor(config.GetColor("btn_bg"))
|
m.SetButtonBackgroundColor(config.GetColor("btn_bg"))
|
||||||
m.SetButtonTextColor(config.GetColor("btn_text"))
|
m.SetButtonTextColor(config.GetColor("btn_text"))
|
||||||
|
form = m.GetForm()
|
||||||
|
form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
|
||||||
|
form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
|
||||||
} else {
|
} else {
|
||||||
m := infoModal
|
m := infoModal
|
||||||
m.SetBackgroundColor(tcell.ColorBlack)
|
m.SetBackgroundColor(tcell.ColorBlack)
|
||||||
m.SetButtonBackgroundColor(tcell.ColorWhite)
|
m.SetButtonBackgroundColor(tcell.ColorWhite)
|
||||||
m.SetButtonTextColor(tcell.ColorBlack)
|
m.SetButtonTextColor(tcell.ColorBlack)
|
||||||
m.SetTextColor(tcell.ColorWhite)
|
m.SetTextColor(tcell.ColorWhite)
|
||||||
|
form := m.GetForm()
|
||||||
|
form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
|
||||||
|
form.SetButtonTextColorFocused(tcell.ColorWhite)
|
||||||
frame := infoModal.GetFrame()
|
frame := infoModal.GetFrame()
|
||||||
frame.SetBorderColor(tcell.ColorWhite)
|
frame.SetBorderColor(tcell.ColorWhite)
|
||||||
frame.SetTitleColor(tcell.ColorWhite)
|
frame.SetTitleColor(tcell.ColorWhite)
|
||||||
@ -90,6 +104,9 @@ func modalInit() {
|
|||||||
m.SetButtonBackgroundColor(tcell.ColorWhite)
|
m.SetButtonBackgroundColor(tcell.ColorWhite)
|
||||||
m.SetButtonTextColor(tcell.ColorBlack)
|
m.SetButtonTextColor(tcell.ColorBlack)
|
||||||
m.SetTextColor(tcell.ColorWhite)
|
m.SetTextColor(tcell.ColorWhite)
|
||||||
|
form = m.GetForm()
|
||||||
|
form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
|
||||||
|
form.SetButtonTextColorFocused(tcell.ColorWhite)
|
||||||
frame = errorModal.GetFrame()
|
frame = errorModal.GetFrame()
|
||||||
frame.SetBorderColor(tcell.ColorWhite)
|
frame.SetBorderColor(tcell.ColorWhite)
|
||||||
frame.SetTitleColor(tcell.ColorWhite)
|
frame.SetTitleColor(tcell.ColorWhite)
|
||||||
@ -102,14 +119,19 @@ func modalInit() {
|
|||||||
frame = inputModal.GetFrame()
|
frame = inputModal.GetFrame()
|
||||||
frame.SetBorderColor(tcell.ColorWhite)
|
frame.SetBorderColor(tcell.ColorWhite)
|
||||||
frame.SetTitleColor(tcell.ColorWhite)
|
frame.SetTitleColor(tcell.ColorWhite)
|
||||||
form := inputModal.GetForm()
|
form = inputModal.GetForm()
|
||||||
form.SetFieldBackgroundColor(tcell.ColorWhite)
|
form.SetFieldBackgroundColor(tcell.ColorWhite)
|
||||||
form.SetFieldTextColor(tcell.ColorBlack)
|
form.SetFieldTextColor(tcell.ColorBlack)
|
||||||
|
form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
|
||||||
|
form.SetButtonTextColorFocused(tcell.ColorWhite)
|
||||||
|
|
||||||
// YesNo background color is changed in funcs
|
// YesNo background color is changed in funcs
|
||||||
m = yesNoModal
|
m = yesNoModal
|
||||||
m.SetButtonBackgroundColor(tcell.ColorWhite)
|
m.SetButtonBackgroundColor(tcell.ColorWhite)
|
||||||
m.SetButtonTextColor(tcell.ColorBlack)
|
m.SetButtonTextColor(tcell.ColorBlack)
|
||||||
|
form = m.GetForm()
|
||||||
|
form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
|
||||||
|
form.SetButtonTextColorFocused(tcell.ColorWhite)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Modal functions that can't be added up above, because they return the wrong type
|
// Modal functions that can't be added up above, because they return the wrong type
|
||||||
|
@ -113,7 +113,7 @@ func setPage(t *tab, p *structs.Page) {
|
|||||||
|
|
||||||
// Set tab number in case a favicon from before overwrote it
|
// Set tab number in case a favicon from before overwrote it
|
||||||
tabNum := tabNumber(t)
|
tabNum := tabNumber(t)
|
||||||
browser.SetTabLabel(strconv.Itoa(tabNum), strconv.Itoa(tabNum+1))
|
browser.SetTabLabel(strconv.Itoa(tabNum), makeTabLabel(strconv.Itoa(tabNum+1)))
|
||||||
App.Draw()
|
App.Draw()
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
|
@ -13,6 +13,12 @@ import (
|
|||||||
|
|
||||||
// This file contains funcs that are small, self-contained utilities.
|
// This file contains funcs that are small, self-contained utilities.
|
||||||
|
|
||||||
|
// makeTabLabel takes a string and adds spacing to it, making it
|
||||||
|
// suitable for display as a tab label.
|
||||||
|
func makeTabLabel(s string) string {
|
||||||
|
return " " + s + " "
|
||||||
|
}
|
||||||
|
|
||||||
// tabNumber gets the index of the tab in the tabs slice. It returns -1
|
// tabNumber gets the index of the tab in the tabs slice. It returns -1
|
||||||
// if the tab is not in that slice.
|
// if the tab is not in that slice.
|
||||||
func tabNumber(t *tab) int {
|
func tabNumber(t *tab) int {
|
||||||
|
Loading…
Reference in New Issue
Block a user