mirror of
https://github.com/JanDeDobbeleer/oh-my-posh.git
synced 2024-11-09 20:44:03 -08:00
refactor: remove powerline bg color
This commit is contained in:
parent
bbeba938f6
commit
f410c32f6e
|
@ -72,6 +72,5 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"console_background_color": "#193549",
|
|
||||||
"end_space_enabled": true
|
"end_space_enabled": true
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
"type": "time",
|
"type": "time",
|
||||||
"style": "plain",
|
"style": "plain",
|
||||||
"foreground": "#007ACC",
|
"foreground": "#007ACC",
|
||||||
"background": "#193549",
|
|
||||||
"properties": {
|
"properties": {
|
||||||
"time_format": "15:04:05"
|
"time_format": "15:04:05"
|
||||||
}
|
}
|
||||||
|
@ -65,6 +64,5 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"console_background_color": "#193549",
|
|
||||||
"end_space_enabled": true
|
"end_space_enabled": true
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,6 +57,5 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"console_background_color": "#193549",
|
|
||||||
"end_space_enabled": true
|
"end_space_enabled": true
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,6 +98,5 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"console_background_color": "#193549",
|
|
||||||
"end_space_enabled": true
|
"end_space_enabled": true
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,6 +90,5 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"console_background_color": "#193549",
|
|
||||||
"end_space_enabled": true
|
"end_space_enabled": true
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,6 +67,5 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"console_background_color": "#193549",
|
|
||||||
"end_space_enabled": true
|
"end_space_enabled": true
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"fmt"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
@ -13,13 +14,23 @@ type ColorWriter struct {
|
||||||
Buffer *bytes.Buffer
|
Buffer *bytes.Buffer
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
//Transparent implies a transparent color
|
||||||
|
Transparent string = "transparent"
|
||||||
|
)
|
||||||
|
|
||||||
func (w *ColorWriter) writeColoredText(background string, foreground string, text string) {
|
func (w *ColorWriter) writeColoredText(background string, foreground string, text string) {
|
||||||
var coloredText string
|
var coloredText string
|
||||||
if background != "" {
|
if foreground == Transparent {
|
||||||
style := color.HEXStyle(foreground, background)
|
style := color.HEX(background, false)
|
||||||
|
colorCodes := style.Code()
|
||||||
|
// this takes the colors and inverts them so the foreground becomes transparent
|
||||||
|
coloredText = fmt.Sprintf("\x1b[%s;49m\x1b[7m%s\x1b[m\x1b[0m", colorCodes, text)
|
||||||
|
} else if background == "" || background == Transparent {
|
||||||
|
style := color.HEX(foreground)
|
||||||
coloredText = style.Sprint(text)
|
coloredText = style.Sprint(text)
|
||||||
} else {
|
} else {
|
||||||
style := color.HEX(foreground)
|
style := color.HEXStyle(foreground, background)
|
||||||
coloredText = style.Sprint(text)
|
coloredText = style.Sprint(text)
|
||||||
}
|
}
|
||||||
w.Buffer.WriteString(coloredText)
|
w.Buffer.WriteString(coloredText)
|
||||||
|
|
|
@ -35,3 +35,12 @@ func TestWriteColorOverride(t *testing.T) {
|
||||||
writer.write("#193549", "#ff5733", text)
|
writer.write("#193549", "#ff5733", text)
|
||||||
assert.NotContains(t, writer.string(), "<#ff5733>")
|
assert.NotContains(t, writer.string(), "<#ff5733>")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestWriteColorTransparent(t *testing.T) {
|
||||||
|
writer := &ColorWriter{
|
||||||
|
Buffer: new(bytes.Buffer),
|
||||||
|
}
|
||||||
|
text := "This is white"
|
||||||
|
writer.writeColoredText("#193549", Transparent, text)
|
||||||
|
t.Log(writer.string())
|
||||||
|
}
|
||||||
|
|
12
engine.go
12
engine.go
|
@ -18,13 +18,13 @@ type engine struct {
|
||||||
|
|
||||||
func (e *engine) getPowerlineColor(foreground bool) string {
|
func (e *engine) getPowerlineColor(foreground bool) string {
|
||||||
if e.previousActiveSegment == nil {
|
if e.previousActiveSegment == nil {
|
||||||
return e.settings.ConsoleBackgroundColor
|
return Transparent
|
||||||
}
|
}
|
||||||
if !foreground && e.activeSegment.Style != Powerline {
|
if !foreground && e.activeSegment.Style != Powerline {
|
||||||
return e.settings.ConsoleBackgroundColor
|
return Transparent
|
||||||
}
|
}
|
||||||
if foreground && e.previousActiveSegment.Style != Powerline {
|
if foreground && e.previousActiveSegment.Style != Powerline {
|
||||||
return e.settings.ConsoleBackgroundColor
|
return Transparent
|
||||||
}
|
}
|
||||||
return e.previousActiveSegment.Background
|
return e.previousActiveSegment.Background
|
||||||
}
|
}
|
||||||
|
@ -56,9 +56,9 @@ func (e *engine) renderPlainSegment(text string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *engine) renderDiamondSegment(text string) {
|
func (e *engine) renderDiamondSegment(text string) {
|
||||||
e.renderer.write(e.settings.ConsoleBackgroundColor, e.activeSegment.Background, e.activeSegment.LeadingDiamond)
|
e.renderer.write(Transparent, e.activeSegment.Background, e.activeSegment.LeadingDiamond)
|
||||||
e.renderText(text)
|
e.renderText(text)
|
||||||
e.renderer.write(e.settings.ConsoleBackgroundColor, e.activeSegment.Background, e.activeSegment.TrailingDiamond)
|
e.renderer.write(Transparent, e.activeSegment.Background, e.activeSegment.TrailingDiamond)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *engine) getStringProperty(property Property, defaultValue string) string {
|
func (e *engine) getStringProperty(property Property, defaultValue string) string {
|
||||||
|
@ -102,7 +102,7 @@ func (e *engine) renderBlockSegments(block *Block) string {
|
||||||
e.renderSegmentText(text)
|
e.renderSegmentText(text)
|
||||||
}
|
}
|
||||||
if e.previousActiveSegment != nil && e.previousActiveSegment.Style == Powerline {
|
if e.previousActiveSegment != nil && e.previousActiveSegment.Style == Powerline {
|
||||||
e.writePowerLineSeparator(e.settings.ConsoleBackgroundColor, e.previousActiveSegment.Background)
|
e.writePowerLineSeparator(Transparent, e.previousActiveSegment.Background)
|
||||||
}
|
}
|
||||||
return e.renderer.string()
|
return e.renderer.string()
|
||||||
}
|
}
|
||||||
|
|
10
settings.go
10
settings.go
|
@ -8,10 +8,9 @@ import (
|
||||||
|
|
||||||
//Settings holds all the theme for rendering the prompt
|
//Settings holds all the theme for rendering the prompt
|
||||||
type Settings struct {
|
type Settings struct {
|
||||||
ConsoleBackgroundColor string `json:"console_background_color"`
|
RightSegmentOffset int `json:"right_segment_offset"`
|
||||||
RightSegmentOffset int `json:"right_segment_offset"`
|
EndSpaceEnabled bool `json:"end_space_enabled"`
|
||||||
EndSpaceEnabled bool `json:"end_space_enabled"`
|
Blocks []*Block `json:"blocks"`
|
||||||
Blocks []*Block `json:"blocks"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//BlockType type of block
|
//BlockType type of block
|
||||||
|
@ -70,8 +69,7 @@ func loadUserConfiguration(env environmentInfo) (*Settings, error) {
|
||||||
|
|
||||||
func getDefaultSettings() *Settings {
|
func getDefaultSettings() *Settings {
|
||||||
settings := &Settings{
|
settings := &Settings{
|
||||||
EndSpaceEnabled: true,
|
EndSpaceEnabled: true,
|
||||||
ConsoleBackgroundColor: "#193549",
|
|
||||||
Blocks: []*Block{
|
Blocks: []*Block{
|
||||||
{
|
{
|
||||||
Type: Prompt,
|
Type: Prompt,
|
||||||
|
|
Loading…
Reference in a new issue