blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: fix wrong size of the new window after vertical split (closes #1612)

Browse Source
This commit is contained in:
Sébastien Helleu 2021-02-08 18:47:44 +01:00
parent 8a6a135b45
commit 00409cba6a
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.adoc
View File

@ -596,6 +596,7 @@ New features::
Bug fixes::
* core: fix wrong size of the new window after vertical split (issue #1612)
* core: do not change the chat prefix size when a filtered line is added (issue #1092)
* core: fix display of nicks in nicklist when they are in a group with sub-groups (issue #1079)
* core, plugins: check return code of strftime function

24
src/gui/curses/gui-curses-window.c
View File

@ -1706,7 +1706,7 @@ gui_window_auto_resize (struct t_gui_window_tree *tree,
else
{
tree->window->win_width_pct = (tree == parent->child1) ?
parent->split_pct : 100 - parent->split_pct;
100 - parent->split_pct : parent->split_pct;
tree->window->win_height_pct = 100;
}
}
@ -1729,8 +1729,8 @@ gui_window_auto_resize (struct t_gui_window_tree *tree,
else
{
separator = (CONFIG_BOOLEAN(config_look_window_separator_vertical)) ? 1 : 0;
size1 = (width * tree->split_pct) / 100;
size2 = width - size1 - separator;
size2 = (width * tree->split_pct) / 100;
size1 = width - size2 - separator;
if (gui_window_auto_resize (tree->child1, x, y,
size1, height, simulate) < 0)
return -1;
@ -1885,8 +1885,8 @@ gui_window_split_vertical (struct t_gui_window *window, int percentage)
separator = (CONFIG_BOOLEAN(config_look_window_separator_vertical)) ? 1 : 0;
width1 = (window->win_width * percentage) / 100;
width2 = window->win_width - width1 - separator;
width2 = (window->win_width * percentage) / 100;
width1 = window->win_width - width2 - separator;
if ((width1 >= 1) && (width2 >= 1)
&& (percentage > 0) && (percentage < 100))
@ -1935,15 +1935,10 @@ gui_window_resize (struct t_gui_window_tree *tree, int percentage)
if (parent)
{
old_split_pct = parent->split_pct;
if (((parent->split_horizontal) && (tree == parent->child2))
|| ((!(parent->split_horizontal)) && (tree == parent->child1)))
{
if (tree == parent->child2)
parent->split_pct = percentage;
}
else
{
parent->split_pct = 100 - percentage;
}
add_bottom = gui_bar_root_get_size (NULL, GUI_BAR_POSITION_BOTTOM);
add_top = gui_bar_root_get_size (NULL, GUI_BAR_POSITION_TOP);
@ -1977,15 +1972,10 @@ gui_window_resize_delta (struct t_gui_window_tree *tree, int delta_percentage)
if (parent)
{
old_split_pct = parent->split_pct;
if (((parent->split_horizontal) && (tree == parent->child2))
|| ((!(parent->split_horizontal)) && (tree == parent->child1)))
{
if (tree == parent->child2)
parent->split_pct += delta_percentage;
}
else
{
parent->split_pct -= delta_percentage;
}
if (parent->split_pct < 1)
parent->split_pct = 1;
else if (parent->split_pct > 99)