Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-11-28 15:56:27 +00:00
Code Issues Projects Releases Wiki Activity

[fzf-tmux] Fix zoomed pane handling in popup mode (#2054)

Browse Source 
When called with popup options, do not move to temp window.
This commit is contained in:
karasu 2020-05-23 20:47:43 +09:00 committed by GitHub
parent 97a725fbd0
commit 01cf01e084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/fzf-tmux
View File

@ -138,9 +138,9 @@ fi
# --height option is not allowed # --height option is not allowed
args=("--no-height" "${args[@]}") args=("--no-height" "${args[@]}")
# Handle zoomed tmux pane by moving it to a temp window # Handle zoomed tmux pane without popup options by moving it to a temp window
if tmux list-panes -F '#F' | grep -q Z; then if [[ ! "$opt" =~ "-K -E" ]] && tmux list-panes -F '#F' | grep -q Z; then
zoomed=1 zoomed_without_popup=1
original_window=$(tmux display-message -p "#{window_id}") original_window=$(tmux display-message -p "#{window_id}")
tmp_window=$(tmux new-window -d -P -F "#{window_id}" "bash -c 'while :; do for c in \\| / - '\\;' do sleep 0.2; printf \"\\r\$c fzf-tmux is running\\r\"; done; done'") tmp_window=$(tmux new-window -d -P -F "#{window_id}" "bash -c 'while :; do for c in \\| / - '\\;' do sleep 0.2; printf \"\\r\$c fzf-tmux is running\\r\"; done; done'")
tmux swap-pane -t $tmp_window \; select-window -t $tmp_window tmux swap-pane -t $tmp_window \; select-window -t $tmp_window
@ -162,8 +162,8 @@ cleanup() {
eval "tmux ${tmux_win_opts[@]}" eval "tmux ${tmux_win_opts[@]}"
fi fi
# Remove temp window if we were zoomed # Remove temp window if we were zoomed without popup options
if [[ -n "$zoomed" ]]; then if [[ -n "$zoomed_without_popup" ]]; then
tmux display-message -p "#{window_id}" > /dev/null tmux display-message -p "#{window_id}" > /dev/null
tmux swap-pane -t $original_window \; \ tmux swap-pane -t $original_window \; \
select-window -t $original_window \; \ select-window -t $original_window \; \