Skip to content

Commit

Permalink
review: do not auto. set --border with native popup border
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Auernhammer <[email protected]>
  • Loading branch information
aead committed Jan 3, 2025
1 parent 2939e38 commit f95c318
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
11 changes: 4 additions & 7 deletions src/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,7 @@ func defaultTmuxOptions(index int) *tmuxOptions {
position: posCenter,
width: sizeSpec{50, true},
height: sizeSpec{50, true},
index: index,
}
index: index}
}

func parseTmuxOptions(arg string, index int) (*tmuxOptions, error) {
Expand Down Expand Up @@ -660,8 +659,7 @@ func defaultOptions() *Options {
WalkerRoot: []string{"."},
WalkerSkip: []string{".git", "node_modules"},
Help: false,
Version: false,
}
Version: false}
}

func optString(arg string, prefixes ...string) (bool, string) {
Expand Down Expand Up @@ -1736,7 +1734,7 @@ func strLines(str string) []string {
}

func parseSize(str string, maxPercent float64, label string) (sizeSpec, error) {
spec := sizeSpec{}
var spec = sizeSpec{}
var val float64
var err error
percent := strings.HasSuffix(str, "%")
Expand Down Expand Up @@ -1822,8 +1820,7 @@ func parseInfoStyle(str string) (infoStyle, string, error) {
}
for _, spec := range []infoSpec{
{"inline", infoInline},
{"inline-right", infoInlineRight},
} {
{"inline-right", infoInlineRight}} {
if strings.HasPrefix(str, spec.name+":") {
return spec.style, strings.ReplaceAll(str[len(spec.name)+1:], "\n", " "), nil
}
Expand Down
2 changes: 1 addition & 1 deletion src/tmux.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ func runTmux(args []string, opts *Options) (int, error) {
// Prepare arguments
fzf := args[0]
args = append([]string{"--bind=ctrl-z:ignore"}, args[1:]...)
if opts.BorderShape == tui.BorderUndefined {
if opts.BorderShape == tui.BorderUndefined && !opts.Tmux.border {
args = append(args, "--border")
}
argStr := escapeSingleQuote(fzf)
Expand Down

0 comments on commit f95c318

Please sign in to comment.