Skip to content

fix: specify the color for right separator of the status modules to be the same as text bg color #429

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.

Sign up for GitHub

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
merged 5 commits into from
Nov 17, 2024
Merged

fix: specify the color for right separator of the status modules to be the same as text bg color #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a980530
fix: specify the color for right separator to be the same as text bg …
xafarr Nov 10, 2024
2ac64e6
Fix tests for the previous commit
xafarr Nov 11, 2024
0e6bdbf
Revert "Changes that add spacing among windows"
xafarr Nov 11, 2024
17aa7dc
Use a space instead of a vertical block char
kjnsn Nov 17, 2024
1a772c2
Merge branch 'main' into fix-separator-color
kjnsn Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion catppuccin_options_tmux.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ set -ogq @catppuccin_window_flags_icon_format "##{?window_activity_flag,#{E:@cat
# Status line options
set -ogq @catppuccin_status_left_separator ""
set -ogq @catppuccin_status_middle_separator ""
set -ogq @catppuccin_status_right_separator "#[reverse]█#[noreverse]"
set -ogq @catppuccin_status_right_separator " "
set -ogq @catppuccin_status_connect_separator "yes" # yes, no

# Maintain backwards compatibility. Use @catppuccin_status_module_bg_color if it is set.
Expand Down
2 changes: 1 addition & 1 deletion tests/application_module_expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@catppuccin_status_application #[fg=#eba0ac]#[fg=#11111b,bg=#eba0ac] #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_application_text}#[reverse]█#[noreverse]
@catppuccin_status_application #[fg=#eba0ac]#[fg=#11111b,bg=#eba0ac] #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_application_text}#[fg=#313244]
2 changes: 1 addition & 1 deletion tests/battery_module_expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@catppuccin_status_battery #[fg=#b4befe]#[fg=#11111b,bg=#b4befe]#{l:#{battery_icon}} #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_battery_text}#[reverse]█#[noreverse]
@catppuccin_status_battery #[fg=#b4befe]#[fg=#11111b,bg=#b4befe]#{l:#{battery_icon}} #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_battery_text}#[fg=#313244]
2 changes: 1 addition & 1 deletion tests/cpu_module_expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
E:@catppuccin_status_cpu #[fg=#f9e2af]#[fg=#11111b,bg=#f9e2af] #[fg=#{cpu_fg_color},bg=#{cpu_bg_color}] #{cpu_percentage}#[reverse]█#[noreverse]
E:@catppuccin_status_cpu #[fg=#f9e2af]#[fg=#11111b,bg=#f9e2af] #[fg=#{cpu_fg_color},bg=#{cpu_bg_color}] #{cpu_percentage}#[fg=#{cpu_bg_color}]
2 changes: 1 addition & 1 deletion utils/status_module.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ set -agF "@catppuccin_status_${MODULE_NAME}" \

set -ag "@catppuccin_status_${MODULE_NAME}" "#{E:@catppuccin_${MODULE_NAME}_text}"

set -agF "@catppuccin_status_${MODULE_NAME}" "#{@_ctp_connect_style}#{@catppuccin_status_right_separator}"
set -agF "@catppuccin_status_${MODULE_NAME}" "#[fg=#{@_ctp_module_text_bg}]#{@_ctp_connect_style}#{@catppuccin_status_right_separator}"

set -ug @_ctp_connect_style
set -ug @_ctp_module_text_bg