Skip to content

Commit 9684041

Browse files
vdbekjnsn
authored andcommitted
fix(window): middle separator colors (catppuccin#369)
* 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 <[email protected]>
1 parent a966507 commit 9684041

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

catppuccin_tmux.conf

+16-12
Original file line numberDiff line numberDiff line change
@@ -190,24 +190,26 @@ set -ogqF @catppuccin_window_current_right_separator "#{@catppuccin_window_right
190190

191191
%else
192192

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

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

199+
set -g @_ctp_w_left \
200+
"#[fg=#{E:@catppuccin_window_default_background},bg=default]#{@catppuccin_window_left_separator}"
201+
# Inherit colors from text or number
202+
set -g @_ctp_w_middle \
203+
"#{@catppuccin_window_current_middle_separator}"
204204
set -g @_ctp_w_right \
205205
"#[fg=#{E:@catppuccin_window_default_background},bg=default]#{@catppuccin_window_right_separator}"
206206
set -g @_ctp_w_text \
207207
"#[fg=#{@thm_crust},bg=#{E:@catppuccin_window_default_background}]#{@catppuccin_window_default_text}"
208208

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

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

@@ -256,24 +258,26 @@ set -ogqF @catppuccin_window_current_right_separator "#{@catppuccin_window_right
256258

257259
%else
258260

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

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

267+
set -g @_ctp_w_left \
268+
"#[fg=#{E:@catppuccin_window_current_background},bg=default]#{@catppuccin_window_current_left_separator}"
269+
# Inherit colors from text or number
270+
set -g @_ctp_w_middle \
271+
"#{@catppuccin_window_current_middle_separator}"
270272
set -g @_ctp_w_right \
271273
"#[fg=#{E:@catppuccin_window_current_background},bg=default]#{@catppuccin_window_current_right_separator}"
272274
set -g @_ctp_w_text \
273275
"#[fg=#{@thm_crust},bg=#{E:@catppuccin_window_current_background}]#{@catppuccin_window_current_text}"
274276

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

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

0 commit comments

Comments
 (0)