File tree 10 files changed +51
-6
lines changed
10 files changed +51
-6
lines changed Original file line number Diff line number Diff line change @@ -43,17 +43,25 @@ run_bc_program() {
43
43
echo " ${GF_BC_STL} ${GF_BC_LIB} ${WIDTH_SUBSTITUTED// __HEIGHT__/ $HEIGHT } " | bc -l
44
44
}
45
45
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
+ }
48
49
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
50
60
PREVIEW_DIRECTION=" $GF_VERTICAL_PREVIEW_LOCATION "
51
61
PREVIEW_SIZE=" $( run_bc_program " $GF_VERTICAL_PREVIEW_PERCENT_CALCULATION " ) "
52
- SHOULD_HIDE_HELP=" $( run_bc_program " $GF_VERTICAL_HIDE_HELP_CALCULATION " ) "
53
62
else
54
63
PREVIEW_DIRECTION=" $GF_HORIZONTAL_PREVIEW_LOCATION "
55
64
PREVIEW_SIZE=" $( run_bc_program " $GF_HORIZONTAL_PREVIEW_PERCENT_CALCULATION " ) "
56
- SHOULD_HIDE_HELP=" $( run_bc_program " $GF_HORIZONTAL_HIDE_HELP_CALCULATION " ) "
57
65
fi
58
66
59
67
# NB: round the `bc -l` result
Original file line number Diff line number Diff line change @@ -22,6 +22,7 @@ Type to filter. '"${WHITE}Enter${NORMAL} to ${GREEN}ACCEPT${NORMAL}"'
22
22
BRANCH_HEADER_BRANCH_CHECKOUT=" ${GREEN}${BOLD} checkout ${YELLOW}${BOLD} ${NORMAL} ${WHITE}${GIT_FUZZY_BRANCH_CHECKOUT_KEY}${NORMAL} "
23
23
BRANCH_HEADER_FILE_CHECKOUT=" ${GREEN}${BOLD} checkout ${YELLOW}${BOLD} 📁${NORMAL} ${WHITE}${GIT_FUZZY_BRANCH_CHECKOUT_FILE_KEY}${NORMAL} "
24
24
if [ -n " $( git status --short) " ]; then
25
+ # files are dirty - warn that checkout is potentially undesired
25
26
BRANCH_HEADER_BRANCH_CHECKOUT=" ${GRAY} (${RED}${BOLD} *${GRAY} ) ${RED}${BOLD} checkout ${YELLOW}${BOLD} ${NORMAL} ${WHITE}${GIT_FUZZY_BRANCH_CHECKOUT_KEY}${NORMAL} "
26
27
BRANCH_HEADER_FILE_CHECKOUT=" ${GRAY} (${RED}${BOLD} *${GRAY} ) ${RED}${BOLD} checkout ${YELLOW}${BOLD} 📁${NORMAL} ${WHITE}${GIT_FUZZY_BRANCH_CHECKOUT_FILE_KEY}${NORMAL} "
27
28
BRANCH_HEADER=" $BRANCH_HEADER " '
@@ -36,6 +37,10 @@ BRANCH_HEADER="$BRANCH_HEADER"'
36
37
37
38
'
38
39
40
+ if [ " $( should_hide_header) " = ' 1' ]; then
41
+ BRANCH_HEADER=' '
42
+ fi
43
+
39
44
# shellcheck disable=2046,2016,2090,2086
40
45
gf_fzf_one -m \
41
46
--header " $BRANCH_HEADER " \
Original file line number Diff line number Diff line change @@ -9,6 +9,10 @@ GF_DIFF_CHECKOUT_HEADER='
9
9
10
10
'
11
11
12
+ if [ " $( should_hide_header) " = ' 1' ]; then
13
+ GF_DIFF_CHECKOUT_HEADER=' '
14
+ fi
15
+
12
16
gf_fzf_diff_checkout () {
13
17
# shellcheck disable=2016
14
18
RELOAD_COMMAND=" git fuzzy helper diff_direct_menu_content {q} '$1 ' '$2 '"
Original file line number Diff line number Diff line change @@ -6,6 +6,10 @@ GF_DIFF_DIRECT_HEADER='
6
6
7
7
'
8
8
9
+ if [ " $( should_hide_header) " = ' 1' ]; then
10
+ GF_DIFF_DIRECT_HEADER=' '
11
+ fi
12
+
9
13
gf_fzf_diff_direct () {
10
14
PARAMETERS_QUOTED=" $( quote_params " $@ " ) "
11
15
Original file line number Diff line number Diff line change @@ -8,6 +8,10 @@ Type to filter. '"${WHITE}Enter${NORMAL} to ${GREEN}ACCEPT${NORMAL}."'
8
8
9
9
'
10
10
11
+ if [ " $( should_hide_header) " = ' 1' ]; then
12
+ GF_DIFF_HEADER=' '
13
+ fi
14
+
11
15
GF_DIFF_PREVIEW='
12
16
[ {1} != "nothing" ] &&
13
17
git fuzzy helper diff_preview_content {2} ||
Original file line number Diff line number Diff line change @@ -8,6 +8,10 @@ GF_PR_HEADER='
8
8
9
9
'
10
10
11
+ if [ " $( should_hide_header) " = ' 1' ]; then
12
+ GF_PR_HEADER=' '
13
+ fi
14
+
11
15
gf_fzf_pr_select () {
12
16
gf_fzf -m 2 \
13
17
--header=" $GF_PR_HEADER " \
Original file line number Diff line number Diff line change @@ -14,6 +14,10 @@ Use '"${YELLOW}|${NORMAL} to separate CLI args for ${MAGENTA}git log${NORMAL} vs
14
14
15
15
'
16
16
17
+ if [ " $( should_hide_header) " = ' 1' ]; then
18
+ GF_LOG_HEADER=' '
19
+ fi
20
+
17
21
gf_fzf_log () {
18
22
PARAMS_FOR_SUBSTITUTION=' '
19
23
if [ " $# " -gt 0 ]; then
Original file line number Diff line number Diff line change @@ -14,6 +14,10 @@ Use '"${YELLOW}|${NORMAL} to separate CLI args for ${MAGENTA}git reflog${NORMAL}
14
14
15
15
'
16
16
17
+ if [ " $( should_hide_header) " = ' 1' ]; then
18
+ GF_REFLOG_HEADER=' '
19
+ fi
20
+
17
21
gf_fzf_reflog () {
18
22
PARAMS_FOR_SUBSTITUTION=' '
19
23
if [ " $# " -gt 0 ]; then
Original file line number Diff line number Diff line change @@ -9,11 +9,15 @@ GF_STASH_HEADER='
9
9
' " ${WHITE} Enter${NORMAL} to ${GREEN} QUIT${NORMAL} " '
10
10
11
11
' " ${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} " '
13
13
' " ${GREEN}${BOLD} ⇧${NORMAL} ${GREEN} apply${NORMAL} ${WHITE} $GIT_FUZZY_APPLY_KEY ${NORMAL} ${GRAY} -- applies the selected stash${NORMAL} " '
14
14
15
15
'
16
16
17
+ if [ " $( should_hide_header) " = ' 1' ]; then
18
+ GF_STASH_HEADER=' '
19
+ fi
20
+
17
21
gf_fzf_stash () {
18
22
gf_fzf_one -m \
19
23
--header-lines=2 \
Original file line number Diff line number Diff line change @@ -17,6 +17,10 @@ Type to filter. '"${WHITE}Enter${NORMAL} to ${GREEN}ACCEPT${NORMAL}"'
17
17
18
18
'
19
19
20
+ if [ " $( should_hide_header) " = ' 1' ]; then
21
+ GF_STATUS_HEADER=' '
22
+ fi
23
+
20
24
gf_fzf_status () {
21
25
RELOAD=" reload:git fuzzy helper status_menu_content"
22
26
# doesn't work
You can’t perform that action at this time.
0 commit comments