mirror of
https://github.com/irssi/irssi.git
synced 2026-08-10 12:23:37 +02:00
Fix format_real_length to return the correct length when the input string
includes a trailing wide char. Change statusbar_item_default_handler to compute padding also when item->size < item->min_size, needed after the fix to format_real_length. Patch by Yi-Hsuan Hsin, bug #452. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4416 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
6d11f6f897
commit
c536d1f19c
2 changed files with 5 additions and 2 deletions
|
|
@ -366,6 +366,7 @@ int format_real_length(const char *str, int len)
|
|||
GString *tmp;
|
||||
const char *start;
|
||||
#ifdef HAVE_GLIB2
|
||||
const char *oldstr;
|
||||
gboolean utf8;
|
||||
#endif
|
||||
g_return_val_if_fail(str != NULL, 0);
|
||||
|
|
@ -394,7 +395,10 @@ int format_real_length(const char *str, int len)
|
|||
}
|
||||
|
||||
#ifdef HAVE_GLIB2
|
||||
oldstr = str;
|
||||
len -= advance(&str, utf8);
|
||||
if (len < 0)
|
||||
str = oldstr;
|
||||
#else
|
||||
len--;
|
||||
str++;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue