diff options
Diffstat (limited to 'src/interface.c')
| -rw-r--r-- | src/interface.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/interface.c b/src/interface.c index 10a16e3..d04f0de 100644 --- a/src/interface.c +++ b/src/interface.c @@ -150,8 +150,9 @@ print_input_list(struct context *ctx, struct sink_info *sink, wattron(ctx->menu_win, A_REVERSE); mvwprintw(ctx->menu_win, offset, 2, "%*s%-*s", - 2+1+1, "", /* space for index number + indentation*/ - ctx->max_name_len - 1, input->base.name); + 2+1+input->base.indent, "", /* space for index number */ + ctx->max_name_len - input->base.indent, + input->base.name); if (selected) wattroff(ctx->menu_win, A_REVERSE); @@ -162,27 +163,27 @@ print_input_list(struct context *ctx, struct sink_info *sink, *poffset = offset; } -/* looking for the longest name length of all SINK's and INPUT's */ -static void -set_max_name_len(struct context *ctx) +static inline void +max_name_len_helper(GList *list, guint *max_len) { struct vol_ctl *ctl; - guint len = 0; - ctx->max_name_len = len; + guint len; - list_foreach(ctx->sink_list, ctl) { - len = strlen(ctl->name); + list_foreach(list, ctl) { + len = ctl->indent + strlen(ctl->name); - if (len > ctx->max_name_len) - ctx->max_name_len = len; + if (len > *max_len) + *max_len= len; } +} - list_foreach(ctx->input_list, ctl) { - len = strlen(ctl->name) + 1 /* indentation */; - - if (len > ctx->max_name_len) - ctx->max_name_len = len; - } +/* looking for the longest name length of all SINK's and INPUT's */ +static void +set_max_name_len(struct context *ctx) +{ + ctx->max_name_len = 0; + max_name_len_helper(ctx->sink_list, &ctx->max_name_len); + max_name_len_helper(ctx->input_list, &ctx->max_name_len); } void |