Skip to content

Commit 90d2bfe

Browse files
committed
hide headers when crossing size limit
1 parent 3f0ea0f commit 90d2bfe

File tree

10 files changed

+51
-6
lines changed

10 files changed

+51
-6
lines changed

lib/core.sh

+13-5
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,25 @@ run_bc_program() {
4343
echo "${GF_BC_STL} ${GF_BC_LIB} ${WIDTH_SUBSTITUTED//__HEIGHT__/$HEIGHT}" | bc -l
4444
}
4545

46-
preview_window_size_and_direction() {
47-
IS_VERTICAL="$(run_bc_program "__WIDTH__ / __HEIGHT__ < $GF_VERTICAL_THRESHOLD")"
46+
is_vertical() {
47+
run_bc_program "__WIDTH__ / __HEIGHT__ < $GF_VERTICAL_THRESHOLD"
48+
}
4849

49-
if [ "$IS_VERTICAL" = '1' ]; then
50+
should_hide_header() {
51+
if [ "$(is_vertical)" = '1' ]; then
52+
run_bc_program "$GF_VERTICAL_HIDE_HELP_CALCULATION"
53+
else
54+
run_bc_program "$GF_HORIZONTAL_HIDE_HELP_CALCULATION"
55+
fi
56+
}
57+
58+
preview_window_size_and_direction() {
59+
if [ "$(is_vertical)" = '1' ]; then
5060
PREVIEW_DIRECTION="$GF_VERTICAL_PREVIEW_LOCATION"
5161
PREVIEW_SIZE="$(run_bc_program "$GF_VERTICAL_PREVIEW_PERCENT_CALCULATION")"
52-
SHOULD_HIDE_HELP="$(run_bc_program "$GF_VERTICAL_HIDE_HELP_CALCULATION")"
5362
else
5463
PREVIEW_DIRECTION="$GF_HORIZONTAL_PREVIEW_LOCATION"
5564
PREVIEW_SIZE="$(run_bc_program "$GF_HORIZONTAL_PREVIEW_PERCENT_CALCULATION")"
56-
SHOULD_HIDE_HELP="$(run_bc_program "$GF_HORIZONTAL_HIDE_HELP_CALCULATION")"
5765
fi
5866

5967
# NB: round the `bc -l` result

lib/modules/branch.sh

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Type to filter. '"${WHITE}Enter${NORMAL} to ${GREEN}ACCEPT${NORMAL}"'
2222
BRANCH_HEADER_BRANCH_CHECKOUT=" ${GREEN}${BOLD}checkout ${YELLOW}${BOLD}${NORMAL} ${WHITE}${GIT_FUZZY_BRANCH_CHECKOUT_KEY}${NORMAL}"
2323
BRANCH_HEADER_FILE_CHECKOUT=" ${GREEN}${BOLD}checkout ${YELLOW}${BOLD}📁${NORMAL} ${WHITE}${GIT_FUZZY_BRANCH_CHECKOUT_FILE_KEY}${NORMAL}"
2424
if [ -n "$(git status --short)" ]; then
25+
# files are dirty - warn that checkout is potentially undesired
2526
BRANCH_HEADER_BRANCH_CHECKOUT="${GRAY}(${RED}${BOLD}*${GRAY}) ${RED}${BOLD}checkout ${YELLOW}${BOLD}${NORMAL} ${WHITE}${GIT_FUZZY_BRANCH_CHECKOUT_KEY}${NORMAL}"
2627
BRANCH_HEADER_FILE_CHECKOUT="${GRAY}(${RED}${BOLD}*${GRAY}) ${RED}${BOLD}checkout ${YELLOW}${BOLD}📁${NORMAL} ${WHITE}${GIT_FUZZY_BRANCH_CHECKOUT_FILE_KEY}${NORMAL}"
2728
BRANCH_HEADER="$BRANCH_HEADER"'
@@ -36,6 +37,10 @@ BRANCH_HEADER="$BRANCH_HEADER"'
3637
3738
'
3839

40+
if [ "$(should_hide_header)" = '1' ]; then
41+
BRANCH_HEADER=''
42+
fi
43+
3944
# shellcheck disable=2046,2016,2090,2086
4045
gf_fzf_one -m \
4146
--header "$BRANCH_HEADER" \

lib/modules/diff-checkout.sh

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ GF_DIFF_CHECKOUT_HEADER='
99
1010
'
1111

12+
if [ "$(should_hide_header)" = '1' ]; then
13+
GF_DIFF_CHECKOUT_HEADER=''
14+
fi
15+
1216
gf_fzf_diff_checkout() {
1317
# shellcheck disable=2016
1418
RELOAD_COMMAND="git fuzzy helper diff_direct_menu_content {q} '$1' '$2'"

lib/modules/diff-direct.sh

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ GF_DIFF_DIRECT_HEADER='
66
77
'
88

9+
if [ "$(should_hide_header)" = '1' ]; then
10+
GF_DIFF_DIRECT_HEADER=''
11+
fi
12+
913
gf_fzf_diff_direct() {
1014
PARAMETERS_QUOTED="$(quote_params "$@")"
1115

lib/modules/diff.sh

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Type to filter. '"${WHITE}Enter${NORMAL} to ${GREEN}ACCEPT${NORMAL}."'
88
99
'
1010

11+
if [ "$(should_hide_header)" = '1' ]; then
12+
GF_DIFF_HEADER=''
13+
fi
14+
1115
GF_DIFF_PREVIEW='
1216
[ {1} != "nothing" ] &&
1317
git fuzzy helper diff_preview_content {2} ||

lib/modules/hub/pr.sh

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ GF_PR_HEADER='
88
99
'
1010

11+
if [ "$(should_hide_header)" = '1' ]; then
12+
GF_PR_HEADER=''
13+
fi
14+
1115
gf_fzf_pr_select() {
1216
gf_fzf -m 2 \
1317
--header="$GF_PR_HEADER" \

lib/modules/log.sh

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ Use '"${YELLOW}|${NORMAL} to separate CLI args for ${MAGENTA}git log${NORMAL} vs
1414
1515
'
1616

17+
if [ "$(should_hide_header)" = '1' ]; then
18+
GF_LOG_HEADER=''
19+
fi
20+
1721
gf_fzf_log() {
1822
PARAMS_FOR_SUBSTITUTION=''
1923
if [ "$#" -gt 0 ]; then

lib/modules/reflog.sh

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ Use '"${YELLOW}|${NORMAL} to separate CLI args for ${MAGENTA}git reflog${NORMAL}
1414
1515
'
1616

17+
if [ "$(should_hide_header)" = '1' ]; then
18+
GF_REFLOG_HEADER=''
19+
fi
20+
1721
gf_fzf_reflog() {
1822
PARAMS_FOR_SUBSTITUTION=''
1923
if [ "$#" -gt 0 ]; then

lib/modules/stash.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ GF_STASH_HEADER='
99
'"${WHITE}Enter${NORMAL} to ${GREEN}QUIT${NORMAL}"'
1010
1111
'"${YELLOW}${BOLD}${NORMAL} ${GREEN}drop${NORMAL} ${WHITE}$GIT_FUZZY_DROP_KEY${NORMAL} ${GRAY}-- drop the selected stash${NORMAL}"'
12-
'"${YELLOW}${BOLD}${NORMAL} ${GREEN}pop ${NORMAL} ${WHITE}$GIT_FUZZY_POP_KEY${NORMAL} ${GRAY}-- pops the selected stash${NORMAL}"'
12+
'"${YELLOW}${BOLD}${NORMAL} ${GREEN}pop ${NORMAL} ${WHITE}$GIT_FUZZY_POP_KEY${NORMAL} ${GRAY}-- pops the selected stash${NORMAL}"'
1313
'"${GREEN}${BOLD}${NORMAL} ${GREEN}apply${NORMAL} ${WHITE}$GIT_FUZZY_APPLY_KEY${NORMAL} ${GRAY}-- applies the selected stash${NORMAL}"'
1414
1515
'
1616

17+
if [ "$(should_hide_header)" = '1' ]; then
18+
GF_STASH_HEADER=''
19+
fi
20+
1721
gf_fzf_stash() {
1822
gf_fzf_one -m \
1923
--header-lines=2 \

lib/modules/status.sh

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Type to filter. '"${WHITE}Enter${NORMAL} to ${GREEN}ACCEPT${NORMAL}"'
1717
1818
'
1919

20+
if [ "$(should_hide_header)" = '1' ]; then
21+
GF_STATUS_HEADER=''
22+
fi
23+
2024
gf_fzf_status() {
2125
RELOAD="reload:git fuzzy helper status_menu_content"
2226
# doesn't work

0 commit comments

Comments
 (0)