Skip to content

Commit

Permalink
fix(window): middle separator colors (catppuccin#369)
Browse files Browse the repository at this point in the history
* fix(window): middle_separator

`middle_separator` is _not_ the same for fill `number` and `all`.
For fill the colors are the same as text or color.

* chore(window): move left inside fill all branch

left_separator was _always_ overwritten in the `fill == number` branch.

Fixes catppuccin#353

---------

Co-authored-by: Kaley Main <kaleymain@google.com>
  • Loading branch information
2 people authored and pauldthomson committed Nov 14, 2024
1 parent a966507 commit 9684041
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions catppuccin_tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -190,24 +190,26 @@ set -ogqF @catppuccin_window_current_right_separator "#{@catppuccin_window_right

%else

# The left and middle separators are the same between "all" and "number".
# The number is the same as well.
set -g @_ctp_w_left \
"#[fg=#{E:@catppuccin_window_default_background},bg=default]#{@catppuccin_window_left_separator}"
set -g @_ctp_w_middle \
"#[fg=#{E:@catppuccin_window_default_background},bg=#{E:@catppuccin_window_default_color}]#{@catppuccin_window_middle_separator}"
# The number is the same between "all" and "number".
set -g @_ctp_w_number \
"#[fg=#{@thm_crust},bg=#{E:@catppuccin_window_default_background}]##I"

%if "#{==:#{@catppuccin_window_default_fill},all}"

set -g @_ctp_w_left \
"#[fg=#{E:@catppuccin_window_default_background},bg=default]#{@catppuccin_window_left_separator}"
# Inherit colors from text or number
set -g @_ctp_w_middle \
"#{@catppuccin_window_current_middle_separator}"
set -g @_ctp_w_right \
"#[fg=#{E:@catppuccin_window_default_background},bg=default]#{@catppuccin_window_right_separator}"
set -g @_ctp_w_text \
"#[fg=#{@thm_crust},bg=#{E:@catppuccin_window_default_background}]#{@catppuccin_window_default_text}"

%elif "#{==:#{@catppuccin_window_default_fill},number}"

set -g @_ctp_w_middle \
"#[fg=#{E:@catppuccin_window_default_background},bg=#{E:@catppuccin_window_default_color}]#{@catppuccin_window_middle_separator}"
set -g @_ctp_w_text \
"#[fg=#{@thm_fg},bg=#{E:@catppuccin_window_default_color}]#{@catppuccin_window_default_text}"

Expand Down Expand Up @@ -256,24 +258,26 @@ set -ogqF @catppuccin_window_current_right_separator "#{@catppuccin_window_right

%else

# The left and middle separators are the same between "all" and "number".
# The number is the same as well.
set -g @_ctp_w_left \
"#[fg=#{E:@catppuccin_window_current_background},bg=default]#{@catppuccin_window_current_left_separator}"
set -g @_ctp_w_middle \
"#[fg=#{E:@catppuccin_window_current_background},bg=#{E:@catppuccin_window_current_color}]#{@catppuccin_window_current_middle_separator}"
# The number is the same between "all" and "number".
set -g @_ctp_w_number \
"#[fg=#{@thm_crust},bg=#{E:@catppuccin_window_current_background}]##I"

%if "#{==:#{@catppuccin_window_current_fill},all}"

set -g @_ctp_w_left \
"#[fg=#{E:@catppuccin_window_current_background},bg=default]#{@catppuccin_window_current_left_separator}"
# Inherit colors from text or number
set -g @_ctp_w_middle \
"#{@catppuccin_window_current_middle_separator}"
set -g @_ctp_w_right \
"#[fg=#{E:@catppuccin_window_current_background},bg=default]#{@catppuccin_window_current_right_separator}"
set -g @_ctp_w_text \
"#[fg=#{@thm_crust},bg=#{E:@catppuccin_window_current_background}]#{@catppuccin_window_current_text}"

%elif "#{==:#{@catppuccin_window_current_fill},number}"

set -g @_ctp_w_middle \
"#[fg=#{E:@catppuccin_window_current_background},bg=#{E:@catppuccin_window_current_color}]#{@catppuccin_window_current_middle_separator}"
set -g @_ctp_w_text \
"#[fg=#{@thm_fg},bg=#{E:@catppuccin_window_current_color}]#{@catppuccin_window_current_text}"

Expand Down

0 comments on commit 9684041

Please sign in to comment.