Skip to content

Commit 48ca147

Browse files
aleeraseraleeraser
committed
fix: status bar item duplication on conf reload
This fixes a weird behavior where a custom status bar item (e.g. a prefix) would be duplicated in the status bar after a configuration reload. e.g. prior to this fix, setting: set -g @theme-status-left-prefix "test" and reloading the configuration multiple times would result in multiple 'test' strings being added as prefix. Fixes #54
1 parent 7c59902 commit 48ca147

33 files changed

+234
-234
lines changed

‎basic.tmuxtheme

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,20 @@ set -goq @theme-status-bg black
5959
set -goq @theme-status-fg cyan
6060
set -goq @theme-status-interval 1
6161
set -goq @theme-status-justify centre
62-
set -goqF @theme-status-left "#{@themepack-status-left-area-left-format} #[fg=white]» #[fg=yellow]#{@themepack-status-left-area-middle-format} #[fg=cyan]#{@themepack-status-left-area-right-format}"
62+
set -goqF @theme-status-left-custom "#{@themepack-status-left-area-left-format} #[fg=white]» #[fg=yellow]#{@themepack-status-left-area-middle-format} #[fg=cyan]#{@themepack-status-left-area-right-format}"
6363
set -goq @theme-status-left-bg black
6464
set -goq @theme-status-left-fg green
6565
set -goq @theme-status-left-length 40
66-
set -goqF @theme-status-right "#{@themepack-status-right-area-left-format} #[fg=white]« #[fg=yellow]#{@themepack-status-right-area-middle-format} #[fg=green]#{@themepack-status-right-area-right-format}"
66+
set -goqF @theme-status-right-custom "#{@themepack-status-right-area-left-format} #[fg=white]« #[fg=yellow]#{@themepack-status-right-area-middle-format} #[fg=green]#{@themepack-status-right-area-right-format}"
6767
set -goq @theme-status-right-bg black
6868
set -goq @theme-status-right-fg cyan
6969
set -goq @theme-status-right-length 40
7070
set -goq @theme-window-status-activity-bg black
7171
set -goq @theme-window-status-activity-fg yellow
7272
set -goq @theme-window-status-current-bg red
7373
set -goq @theme-window-status-current-fg black
74-
set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
75-
set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
74+
set -goqF @theme-window-status-current-format-custom " #{@themepack-window-status-current-format} "
75+
set -goqF @theme-window-status-format-custom " #{@themepack-window-status-format} "
7676
set -goq @theme-window-status-separator ""
7777

7878
# Customizable prefixes and suffixes for @theme-* format options
@@ -86,10 +86,10 @@ set -goq @theme-window-status-prefix ""
8686
set -goq @theme-window-status-suffix ""
8787

8888
# Apply prefixes and suffixes to @theme-* format options
89-
set -gqF @theme-status-left "#{@theme-status-left-prefix}#{@theme-status-left}#{@theme-status-left-suffix}"
90-
set -gqF @theme-status-right "#{@theme-status-right-prefix}#{@theme-status-right}#{@theme-status-right-suffix}"
91-
set -gqF @theme-window-status-current-format "#{@theme-window-status-current-prefix}#{@theme-window-status-current-format}#{@theme-window-status-current-suffix}"
92-
set -gqF @theme-window-status-format "#{@theme-window-status-prefix}#{@theme-window-status-format}#{@theme-window-status-suffix}"
89+
set -gqF @theme-status-left "#{@theme-status-left-prefix}#{@theme-status-left-custom}#{@theme-status-left-suffix}"
90+
set -gqF @theme-status-right "#{@theme-status-right-prefix}#{@theme-status-right_custom}#{@theme-status-right-suffix}"
91+
set -gqF @theme-window-status-current-format "#{@theme-window-status-current-prefix}#{@theme-window-status-current-format-custom}#{@theme-window-status-current-suffix}"
92+
set -gqF @theme-window-status-format "#{@theme-window-status-prefix}#{@theme-window-status-format-custom}#{@theme-window-status-suffix}"
9393

9494
# Apply @theme-* options to Tmux
9595
set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"

‎default.tmuxtheme

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ set -goq @theme-window-status-prefix ""
5252
set -goq @theme-window-status-suffix ""
5353

5454
# Apply prefixes and suffixes to @theme-* format options
55-
set -gqF @theme-status-left "#{@theme-status-left-prefix}#{@theme-status-left}#{@theme-status-left-suffix}"
56-
set -gqF @theme-status-right "#{@theme-status-right-prefix}#{@theme-status-right}#{@theme-status-right-suffix}"
57-
set -gqF @theme-window-status-current-format "#{@theme-window-status-current-prefix}#{@theme-window-status-current-format}#{@theme-window-status-current-suffix}"
58-
set -gqF @theme-window-status-format "#{@theme-window-status-prefix}#{@theme-window-status-format}#{@theme-window-status-suffix}"
55+
set -gqF @theme-status-left "#{@theme-status-left-prefix}#{@theme-status-left-custom}#{@theme-status-left-suffix}"
56+
set -gqF @theme-status-right "#{@theme-status-right-prefix}#{@theme-status-right_custom}#{@theme-status-right-suffix}"
57+
set -gqF @theme-window-status-current-format "#{@theme-window-status-current-prefix}#{@theme-window-status-current-format-custom}#{@theme-window-status-current-suffix}"
58+
set -gqF @theme-window-status-format "#{@theme-window-status-prefix}#{@theme-window-status-format-custom}#{@theme-window-status-suffix}"
5959

6060
# Apply @theme-* options to Tmux
6161
set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"

‎powerline/block/blue.tmuxtheme

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ set -goqF @theme-status-bg "#{@powerline-status-bg}"
101101
set -goqF @theme-status-fg "#{@powerline-status-fg}"
102102
set -goq @theme-status-interval 1
103103
set -goq @theme-status-justify centre
104-
set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
104+
set -goqF @theme-status-left-custom "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
105105
set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
106106
set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
107107
set -goq @theme-status-left-length 40
108-
set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
108+
set -goqF @theme-status-right-custom "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
109109
set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
110110
set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
111111
set -goq @theme-status-right-length 150
@@ -114,8 +114,8 @@ set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
114114
set -goq @theme-window-status-separator ""
115115
set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
116116
set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
117-
set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
118-
set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
117+
set -goqF @theme-window-status-format-custom " #{@themepack-window-status-format} "
118+
set -goqF @theme-window-status-current-format-custom " #{@themepack-window-status-current-format} "
119119

120120
# Customizable prefixes and suffixes for @theme-* format options
121121
set -goq @theme-status-left-prefix ""
@@ -128,10 +128,10 @@ set -goq @theme-window-status-prefix ""
128128
set -goq @theme-window-status-suffix ""
129129

130130
# Apply prefixes and suffixes to @theme-* format options
131-
set -gqF @theme-status-left "#{@theme-status-left-prefix}#{@theme-status-left}#{@theme-status-left-suffix}"
132-
set -gqF @theme-status-right "#{@theme-status-right-prefix}#{@theme-status-right}#{@theme-status-right-suffix}"
133-
set -gqF @theme-window-status-current-format "#{@theme-window-status-current-prefix}#{@theme-window-status-current-format}#{@theme-window-status-current-suffix}"
134-
set -gqF @theme-window-status-format "#{@theme-window-status-prefix}#{@theme-window-status-format}#{@theme-window-status-suffix}"
131+
set -gqF @theme-status-left "#{@theme-status-left-prefix}#{@theme-status-left-custom}#{@theme-status-left-suffix}"
132+
set -gqF @theme-status-right "#{@theme-status-right-prefix}#{@theme-status-right_custom}#{@theme-status-right-suffix}"
133+
set -gqF @theme-window-status-current-format "#{@theme-window-status-current-prefix}#{@theme-window-status-current-format-custom}#{@theme-window-status-current-suffix}"
134+
set -gqF @theme-window-status-format "#{@theme-window-status-prefix}#{@theme-window-status-format-custom}#{@theme-window-status-suffix}"
135135

136136
# Apply @theme-* options to Tmux
137137
set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"

‎powerline/block/cyan.tmuxtheme

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ set -goqF @theme-status-bg "#{@powerline-status-bg}"
101101
set -goqF @theme-status-fg "#{@powerline-status-fg}"
102102
set -goq @theme-status-interval 1
103103
set -goq @theme-status-justify centre
104-
set -goqF @theme-status-left "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
104+
set -goqF @theme-status-left-custom "#[fg=#{@powerline-status-left-area-left-fg},bg=#{@powerline-status-left-area-left-bg},bold] #{@themepack-status-left-area-left-format} #[fg=#{@powerline-status-left-area-left-bg},bg=#{@powerline-status-left-area-middle-bg},nobold]#[fg=#{@powerline-status-left-area-middle-fg},bg=#{@powerline-status-left-area-middle-bg}] #{@themepack-status-left-area-middle-format} #[fg=#{@powerline-status-left-area-middle-bg},bg=#{@powerline-status-left-area-right-bg}]#[fg=#{@powerline-status-left-area-right-fg},bg=#{@powerline-status-left-area-right-bg}] #{@themepack-status-left-area-right-format} #[fg=#{@powerline-status-left-area-right-bg},bg=#{@theme-status-bg},nobold]"
105105
set -goqF @theme-status-left-bg "#{@powerline-status-left-bg}"
106106
set -goqF @theme-status-left-fg "#{@powerline-status-left-fg}"
107107
set -goq @theme-status-left-length 40
108-
set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
108+
set -goqF @theme-status-right-custom "#[fg=#{@powerline-status-right-area-left-bg},bg=#{@theme-status-bg}]#[fg=#{@powerline-status-right-area-left-fg},bg=#{@powerline-status-right-area-left-bg}] #{@themepack-status-right-area-left-format} #[fg=#{@powerline-status-right-area-middle-bg},bg=#{@powerline-status-right-area-left-bg}]#[fg=#{@powerline-status-right-area-middle-fg},bg=#{@powerline-status-right-area-middle-bg}] #{@themepack-status-right-area-middle-format} #[fg=#{@powerline-status-right-area-right-bg},bg=#{@powerline-status-right-area-middle-bg}]#[fg=#{@powerline-status-right-area-right-fg},bg=#{@powerline-status-right-area-right-bg},bold] #{@themepack-status-right-area-right-format} "
109109
set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
110110
set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
111111
set -goq @theme-status-right-length 150
@@ -114,8 +114,8 @@ set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
114114
set -goq @theme-window-status-separator ""
115115
set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
116116
set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
117-
set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
118-
set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "
117+
set -goqF @theme-window-status-format-custom " #{@themepack-window-status-format} "
118+
set -goqF @theme-window-status-current-format-custom " #{@themepack-window-status-current-format} "
119119

120120
# Customizable prefixes and suffixes for @theme-* format options
121121
set -goq @theme-status-left-prefix ""
@@ -128,10 +128,10 @@ set -goq @theme-window-status-prefix ""
128128
set -goq @theme-window-status-suffix ""
129129

130130
# Apply prefixes and suffixes to @theme-* format options
131-
set -gqF @theme-status-left "#{@theme-status-left-prefix}#{@theme-status-left}#{@theme-status-left-suffix}"
132-
set -gqF @theme-status-right "#{@theme-status-right-prefix}#{@theme-status-right}#{@theme-status-right-suffix}"
133-
set -gqF @theme-window-status-current-format "#{@theme-window-status-current-prefix}#{@theme-window-status-current-format}#{@theme-window-status-current-suffix}"
134-
set -gqF @theme-window-status-format "#{@theme-window-status-prefix}#{@theme-window-status-format}#{@theme-window-status-suffix}"
131+
set -gqF @theme-status-left "#{@theme-status-left-prefix}#{@theme-status-left-custom}#{@theme-status-left-suffix}"
132+
set -gqF @theme-status-right "#{@theme-status-right-prefix}#{@theme-status-right_custom}#{@theme-status-right-suffix}"
133+
set -gqF @theme-window-status-current-format "#{@theme-window-status-current-prefix}#{@theme-window-status-current-format-custom}#{@theme-window-status-current-suffix}"
134+
set -gqF @theme-window-status-format "#{@theme-window-status-prefix}#{@theme-window-status-format-custom}#{@theme-window-status-suffix}"
135135

136136
# Apply @theme-* options to Tmux
137137
set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"

0 commit comments

Comments
 (0)