pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-03 08:13:14 +02:00
Code Activity

Fixed nicklist display bug when top/bottom (not enough lines) (bug #17537)

Browse Source
This commit is contained in:
Sebastien Helleu
2006-08-26 15:45:37 +00:00
parent 46205116c2
commit 85cd863819
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -5,6 +5,7 @@ ChangeLog - 2006-08-26
Version 0.2.1 (under dev!):
* fixed nicklist display bug when top/bottom (not enough lines) (bug #17537)
* fixed bug with auto-rejoin of keyed chans (bug #17534)
* added default nick completion when line starts with '//' (bug #17535)
* values yes/no accepted (as on/off) for config boolean values (task #5454)
src/gui/curses/gui-curses-window.c
+6 -4
View File
@@ -168,7 +168,7 @@ gui_window_set_weechat_color (WINDOW *window, int num_color)
int
gui_window_calculate_pos_size (t_gui_window *window, int force_calculate)
{
int max_length, max_height, lines;
int max_length, max_height, lines, width_used;
int num_nicks, num_op, num_halfop, num_voice, num_normal;
int add_right, add_left, add_top, add_bottom;
@@ -203,10 +203,12 @@ gui_window_calculate_pos_size (t_gui_window *window, int force_calculate)
{
nick_count (CHANNEL(window->buffer), &num_nicks, &num_op,
&num_halfop, &num_voice, &num_normal);
if (((max_length + 2) * num_nicks) % (window->win_width - add_left - add_right) == 0)
lines = ((max_length + 2) * num_nicks) / (window->win_width - add_left - add_right);
width_used = (window->win_width - add_left - add_right)
- ((window->win_width - add_left - add_right) % (max_length + 2));
if (((max_length + 2) * num_nicks) % width_used == 0)
lines = ((max_length + 2) * num_nicks) / width_used;
else
lines = (((max_length + 2) * num_nicks) / (window->win_width - add_left - add_right)) + 1;
lines = (((max_length + 2) * num_nicks) / width_used) + 1;
if ((cfg_look_nicklist_max_size > 0) && (lines > cfg_look_nicklist_max_size))
lines = cfg_look_nicklist_max_size;
if ((cfg_look_nicklist_min_size > 0) && (lines < cfg_look_nicklist_min_size))
weechat/ChangeLog
+1
View File
@@ -5,6 +5,7 @@ ChangeLog - 2006-08-26
Version 0.2.1 (under dev!):
* fixed nicklist display bug when top/bottom (not enough lines) (bug #17537)
* fixed bug with auto-rejoin of keyed chans (bug #17534)
* added default nick completion when line starts with '//' (bug #17535)
* values yes/no accepted (as on/off) for config boolean values (task #5454)
weechat/src/gui/curses/gui-curses-window.c
+6 -4
View File
@@ -168,7 +168,7 @@ gui_window_set_weechat_color (WINDOW *window, int num_color)
int
gui_window_calculate_pos_size (t_gui_window *window, int force_calculate)
{
int max_length, max_height, lines;
int max_length, max_height, lines, width_used;
int num_nicks, num_op, num_halfop, num_voice, num_normal;
int add_right, add_left, add_top, add_bottom;
@@ -203,10 +203,12 @@ gui_window_calculate_pos_size (t_gui_window *window, int force_calculate)
{
nick_count (CHANNEL(window->buffer), &num_nicks, &num_op,
&num_halfop, &num_voice, &num_normal);
if (((max_length + 2) * num_nicks) % (window->win_width - add_left - add_right) == 0)
lines = ((max_length + 2) * num_nicks) / (window->win_width - add_left - add_right);
width_used = (window->win_width - add_left - add_right)
- ((window->win_width - add_left - add_right) % (max_length + 2));
if (((max_length + 2) * num_nicks) % width_used == 0)
lines = ((max_length + 2) * num_nicks) / width_used;
else
lines = (((max_length + 2) * num_nicks) / (window->win_width - add_left - add_right)) + 1;
lines = (((max_length + 2) * num_nicks) / width_used) + 1;
if ((cfg_look_nicklist_max_size > 0) && (lines > cfg_look_nicklist_max_size))
lines = cfg_look_nicklist_max_size;
if ((cfg_look_nicklist_min_size > 0) && (lines < cfg_look_nicklist_min_size))