chore/petal/light theme adjustments #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

tauraamui merged 29 commits into petal from chore/petal/light-theme-adjustments

Jan 21, 2026

colors.v

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,26 +5,26 @@ import tauraamui.bobatea as tea
  
    // TODO(tauraamui): consolidate all used colors into a core palette/swatch set

    // and alias reference off of that only in the places/models they are used with

    // alternative names, instead of here. This file is getting messy and out of hand.

    pub const matte_black_bg_color = tea.Color{ 20, 20, 20 }

    pub const matte_black_bg_color = tea.Color{20, 20, 20}

    pub const petal_pink_color  = tea.Color{ 245, 191, 243 }

    pub const petal_green_color = tea.Color{ 97, 242, 136 }

    pub const petal_red_color = tea.Color{ 245, 42, 42 }

    pub const petal_pink_color = tea.Color{245, 191, 243}

    pub const petal_green_color = tea.Color{97, 242, 136}

    pub const petal_red_color = tea.Color{245, 42, 42}

    pub const status_green      = tea.Color{ 145, 237, 145 }

    pub const status_orange     = tea.Color{ 237, 207, 123 }

    pub const status_lilac      = tea.Color{ 194, 110, 230 }

    pub const status_dark_lilac = tea.Color{ 154, 119, 209 }

    pub const status_cyan       = tea.Color{ 138, 222, 237 }

    pub const status_purple     = tea.Color{ 130, 144, 250 }

    pub const status_green = tea.Color{145, 237, 145}

    pub const status_orange = tea.Color{237, 207, 123}

    pub const status_lilac = tea.Color{194, 110, 230}

    pub const status_dark_lilac = tea.Color{154, 119, 209}

    pub const status_cyan = tea.Color{138, 222, 237}

    pub const status_purple = tea.Color{130, 144, 250}

    pub const error_color = petal_red_color

    //

    pub const matte_black_fg_color      = tea.Color.ansi(232)

    pub const matte_white_fg_color      = tea.Color{ 230, 230, 230 }

    pub const bright_off_white_fg_color = tea.Color{ 255, 255, 255 }

    pub const matte_black_fg_color = tea.Color.ansi(232)

    pub const matte_white_fg_color = tea.Color{230, 230, 230}

    pub const bright_off_white_fg_color = tea.Color{255, 255, 255}

    pub const subtle_text_fg_color = tea.Color.ansi(249)

    pub const help_fg_color = tea.Color.ansi(241)

    @@ -33,10 +33,10 @@ pub const selected_highlight_bg_color = tea.Color.ansi(239)
  
    pub const subtle_border_fg_color = petal_pink_color

    pub const status_bar_bg_color         = tea.Color.ansi(234)

    pub const status_file_name_bg_color   = tea.Color{ 86, 86, 86 }

    pub const status_branch_name_bg_color = tea.Color{ 154, 119, 209 }

    pub const status_cursor_pos_bg_color  = tea.Color{ 245, 42, 42 }

    pub const status_bar_bg_color = tea.Color.ansi(234)

    pub const status_file_name_bg_color = tea.Color{86, 86, 86}

    pub const status_branch_name_bg_color = tea.Color{154, 119, 209}

    pub const status_cursor_pos_bg_color = tea.Color{245, 42, 42}

    pub fn fg_color(background_color tea.Color) tea.Color {

    	s_r := f32(background_color.r) / 255

    @@ -47,4 +47,3 @@ pub fn fg_color(background_color tea.Color) tea.Color {
  
    	return if luminance > 0.5 { matte_black_fg_color } else { matte_white_fg_color }

    }

colors_test.v

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,7 +3,6 @@ module palette
  
    import tauraamui.bobatea as tea

    fn test_fg_color_from_shades_of_bg() {

    	assert fg_color(tea.Color{ 10, 10, 10 })    == matte_white_fg_color

    	assert fg_color(tea.Color{ 200, 200, 200 }) == matte_black_fg_color

    	assert fg_color(tea.Color{10, 10, 10}) == matte_white_fg_color

    	assert fg_color(tea.Color{200, 200, 200}) == matte_black_fg_color

    }

config.v

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,7 +5,7 @@ import theme
  
    pub const light_theme_name = theme.light_theme_name

    pub const dark_theme_name = theme.dark_theme_name

    pub struct Config{

    pub struct Config {

    pub:

    	theme      theme.Theme

    	leader_key string

    @@ -14,7 +14,7 @@ pub:
  
    @[params]

    pub struct ConfigOptions {

    pub:

    	load_from_path ?string = "~/.config/petal/petal.cfg"

    	load_from_path ?string = '~/.config/petal/petal.cfg'

    }

    pub fn Config.new(opts ConfigOptions) Config {

    @@ -25,15 +25,14 @@ pub fn Config.new(opts ConfigOptions) Config {
  
    	}

    	return Config{

    		theme: theme.dark_theme

    		leader_key: ";"

    		theme:      theme.dark_theme

    		leader_key: ';'

    	}

    }

    pub fn (c Config) set_theme(name string) Config {

    	return Config{

    		...c

    		theme: if name == "dark" { theme.dark_theme } else { theme.light_theme }

    		theme: if name == 'dark' { theme.dark_theme } else { theme.light_theme }

    	}

    }

debug_screen.v

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,7 +9,7 @@ import palette
  
    interface DebuggableModel {

    	tea.Model

    	Debuggable

    	width()  int

    	width() int

    	height() int

    }

    @@ -58,18 +58,18 @@ enum LogLevel {
  
    fn (l LogLevel) str() string {

    	return match l {

    		.debug { "DEBU" }

    		.info  { "INFO" }

    		.warn  { "WARN" }

    		.error { "ERRO" }

    		.debug { 'DEBU' }

    		.info { 'INFO' }

    		.warn { 'WARN' }

    		.error { 'ERRO' }

    	}

    }

    fn (l LogLevel) fg() tea.Color {

    	return match l {

    		.debug { tea.Color.ansi(62) }

    		.info  { tea.Color.ansi(183) }

    		.warn  { tea.Color.ansi(220) }

    		.info { tea.Color.ansi(183) }

    		.warn { tea.Color.ansi(220) }

    		.error { tea.Color.ansi(162) }

    	}

    }

    @@ -80,7 +80,7 @@ struct LogMsg {
  
    }

    fn log(message string, level LogLevel) tea.Msg {

    	return LogMsg{ level, message }

    	return LogMsg{level, message}

    }

    fn debug_log(message string) tea.Cmd {

    @@ -253,11 +253,11 @@ fn render_logs(mut ctx tea.Context, x int, y int, logs []LogMsg) {
  
    		ctx.set_color(l.level.fg())

    		mut label_x_offset := 0

    		ctx.draw_text(x + label_x_offset, y + i, "[")

    		ctx.draw_text(x + label_x_offset, y + i, '[')

    		label_x_offset += 1

    		ctx.draw_text(x + label_x_offset, y + i, level_label)

    		label_x_offset += tea.visible_len(level_label)

    		ctx.draw_text(x + label_x_offset, y + i, "]")

    		ctx.draw_text(x + label_x_offset, y + i, ']')

    		label_x_offset += 1

    		ctx.reset_color()

    		label_x_offset += 1 // single space padding

    @@ -301,9 +301,13 @@ fn (m DebugScreenModel) debug_data() DebugData {
  
    	}

    }

    fn (m DebugScreenModel) width() int { return m.window_width }

    fn (m DebugScreenModel) width() int {

    	return m.window_width

    }

    fn (m DebugScreenModel) height() int { return m.window_height }

    fn (m DebugScreenModel) height() int {

    	return m.window_height

    }

    fn (m DebugScreenModel) clone() tea.Model {

    	return DebugScreenModel{

editor.v

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -11,26 +11,46 @@ struct ModelCursorPos {
  
    fn (c ModelCursorPos) up() ModelCursorPos {

    	yy := c.y - 1

    	if yy < 0 { return c }

    	return ModelCursorPos{ y: yy, x: 0 }

    	if yy < 0 {

    		return c

    	}

    	return ModelCursorPos{

    		y: yy

    		x: 0

    	}

    }

    fn (c ModelCursorPos) down(max int) ModelCursorPos {

    	yy := c.y + 1

    	if yy >= max { return c }

    	return ModelCursorPos{ y: yy, x: 0 }

    	if yy >= max {

    		return c

    	}

    	return ModelCursorPos{

    		y: yy

    		x: 0

    	}

    }

    fn (c ModelCursorPos) left() ModelCursorPos {

    	xx := c.x - 1

    	if xx < 0 { return c }

    	return ModelCursorPos{ y: c.y, x: xx }

    	if xx < 0 {

    		return c

    	}

    	return ModelCursorPos{

    		y: c.y

    		x: xx

    	}

    }

    fn (c ModelCursorPos) right(max int) ModelCursorPos {

    	yy := c.y + 1

    	if yy >= max { return c }

    	return ModelCursorPos{ y: yy, x: 0 }

    	if yy >= max {

    		return c

    	}

    	return ModelCursorPos{

    		y: yy

    		x: 0

    	}

    }

    struct EditorData {

    @@ -60,16 +80,16 @@ struct OpenEditorMsg {
  
    fn open_editor(file_path string) tea.Cmd {

    	return fn [file_path] () tea.Msg {

    		return OpenEditorMsg{ file_path }

    		return OpenEditorMsg{file_path}

    	}

    }

    struct QueryEditorDataMsg {}

    fn query_editor_data(id int) tea.Cmd {

    	return fn [id] () tea.Msg {

    		return EditorModelMsg {

    			id: id

    		return EditorModelMsg{

    			id:  id

    			msg: QueryEditorDataMsg{}

    		}

    	}

    @@ -81,16 +101,20 @@ struct EditorDataResultMsg {
  
    fn editor_data(data EditorData) tea.Cmd {

    	return fn [data] () tea.Msg {

    		return EditorDataResultMsg{ data }

    		return EditorDataResultMsg{data}

    	}

    }

    fn EditorModel.new(id int, file_path string) EditorModel {

    	assert file_path.len != 0

    	return EditorModel{

    		id: id,

    		file_path: file_path,

    		lines: if content := os.read_lines(file_path) { content } else { []string{ len: 150, init: "This is a line of random text" } }

    		id:        id

    		file_path: file_path

    		lines:     if content := os.read_lines(file_path) {

    			content

    		} else {

    			[]string{len: 150, init: 'This is a line of random text'}

    		}

    	}

    }

    @@ -121,22 +145,20 @@ fn move_cursor_up() tea.Msg {
  
    	return EditorCursorUpMsg{}

    }

    fn (mut m EditorModel) update(msg tea.Msg) (tea.Model, ?tea.Cmd) {

    	mut cmds := []tea.Cmd{}

    	if msg is tea.KeyMsg && m.focused {

    		match msg.k_type {

    			.runes {

    				match msg.string() {

    					"j" {

    					'j' {

    						cmds << move_cursor_down

    						return m.clone(), tea.batch_array(cmds)

    					}

    					"k" {

    					'k' {

    						cmds << move_cursor_up

    						return m.clone(), tea.batch_array(cmds)

    					}

    					else {}

    				}

    @@ -147,7 +169,7 @@ fn (mut m EditorModel) update(msg tea.Msg) (tea.Model, ?tea.Cmd) {
  
    	match msg {

    		tea.ResizedMsg {

    			m.width  = msg.window_width

    			m.width = msg.window_width

    			m.height = msg.window_height

    		}

    		EditorModelMsg {

    @@ -196,25 +218,30 @@ const active_editor_border_color = palette.petal_pink_color
  
    const inactive_editor_border_color = palette.status_dark_lilac

    fn (m EditorModel) view(mut ctx tea.Context) {

    	ctx.set_clip_area(tea.ClipArea{ 0, 0, m.width, m.height })

    	ctx.set_clip_area(tea.ClipArea{0, 0, m.width, m.height})

    	defer { ctx.clear_clip_area() }

    	if m.show_border {

    		border_color := if m.focused { active_editor_border_color } else { inactive_editor_border_color }

    		border_color := if m.focused {

    			active_editor_border_color

    		} else {

    			inactive_editor_border_color

    		}

    		ctx.set_color(border_color)

    		for y in 0..m.height {

    		for y in 0 .. m.height {

    			ctx.draw_text(0, y, '│')

    		}

    		ctx.reset_color()

    		ctx.push_offset(tea.Offset{ x: 1 })

    	}

    	ctx.push_offset(tea.Offset{ x: 1 })

    	for y, l in m.lines {

    		ctx.draw_text(0, y, l.replace('\t', '    '))

    	}

    	if m.focused { m.render_cursor(mut ctx) }

    	if m.focused {

    		m.render_cursor(mut ctx)

    	}

    }

    fn (m EditorModel) render_cursor(mut ctx tea.Context) {

    @@ -228,8 +255,8 @@ fn (m EditorModel) debug_data() DebugData {
  
    	return DebugData{

    		name: 'active editor data'

    		data: {

    			'id': '${m.id}'

    			'file path': m.file_path

    			'id':         '${m.id}'

    			'file path':  m.file_path

    			'cursor_row': '${m.cursor_pos.y}'

    			'cursor_col': '${m.cursor_pos.x}'

    		}

    @@ -245,14 +272,17 @@ fn (m EditorModel) data() EditorData {
  
    	}

    }

    fn (m EditorModel) width() int { return m.width }

    fn (m EditorModel) width() int {

    	return m.width

    }

    fn (m EditorModel) height() int { return m.height }

    fn (m EditorModel) height() int {

    	return m.height

    }

    fn (m EditorModel) clone() tea.Model {

    	assert m.file_path.len != 0

    	return EditorModel{

    		...m

    	}

    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore/petal/light theme adjustments #538

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!