aboutsummaryrefslogtreecommitdiffstats
path: root/weechat/perl/buffers.pl
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2016-01-14 16:46:21 +0000
committerJohannes Löthberg <johannes@kyriasis.com>2016-01-14 16:46:21 +0000
commit7666a9cc93c079cd3a61ea8a7d4cf3103a74c56e (patch)
treee1e1b32e1666bead6a6ac7327bd2e253e989e80e /weechat/perl/buffers.pl
parentcee153e1d03f215139ba6d74a8cd8fe039213992 (diff)
parent81873932548d4dda5345c19c3a635d53e25da061 (diff)
downloaddotfiles-7666a9cc93c079cd3a61ea8a7d4cf3103a74c56e.tar.xz
Merge remote-tracking branch 'k-kyrias/master' into theos
Diffstat (limited to 'weechat/perl/buffers.pl')
-rw-r--r--weechat/perl/buffers.pl17
1 files changed, 14 insertions, 3 deletions
diff --git a/weechat/perl/buffers.pl b/weechat/perl/buffers.pl
index 472f6e9..c31d8fc 100644
--- a/weechat/perl/buffers.pl
+++ b/weechat/perl/buffers.pl
@@ -20,6 +20,8 @@
#
# History:
#
+# 2015-03-29, Ed Santiago <ed@edsantiago.com>
+# v5.1: merged buffers: always indent, except when filling is horizontal
# 2014-12-12
# v5.0: fix cropping non-latin buffer names
# 2014-08-29, Patrick Steinhardt <ps@pks.im>:
@@ -164,7 +166,7 @@ use strict;
use Encode qw( decode encode );
# -----------------------------[ internal ]-------------------------------------
my $SCRIPT_NAME = "buffers";
-my $SCRIPT_VERSION = "5.0";
+my $SCRIPT_VERSION = "5.1";
my $BUFFERS_CONFIG_FILE_NAME = "buffers";
my $buffers_config_file;
@@ -1298,8 +1300,17 @@ sub build_buffers
}
else
{
- my $indent = "";
- $indent = ((" " x length($buffer->{"number"}))." ") if (($position eq "left") || ($position eq "right"));
+ # Indentation aligns channels in a visually appealing way
+ # when viewing list top-to-bottom...
+ my $indent = (" " x length($buffer->{"number"}))." ";
+ # ...except when list is top/bottom and channels left-to-right.
+ my $option_pos = weechat::config_string( weechat::config_get( "weechat.bar.buffers.position" ) );
+ if (($option_pos eq 'top') || ($option_pos eq 'bottom')) {
+ my $option_filling = weechat::config_string( weechat::config_get( "weechat.bar.buffers.filling_top_bottom" ) );
+ if ($option_filling =~ /horizontal/) {
+ $indent = '';
+ }
+ }
$str .= weechat::color("default")
.$color_bg
.$indent;