switch(win->split_method & winmethod_DirMask)
{
case winmethod_Left:
- child1.width = win->constraint_size * win->key_window->unit_width;
+ child1.width = win->key_window?
+ win->constraint_size * win->key_window->unit_width
+ : 0;
break;
case winmethod_Right:
- child2.width = win->constraint_size * win->key_window->unit_width;
+ child2.width = win->key_window?
+ win->constraint_size * win->key_window->unit_width
+ : 0;
break;
case winmethod_Above:
- child1.height = win->constraint_size * win->key_window->unit_height;
+ child1.height = win->key_window?
+ win->constraint_size * win->key_window->unit_height
+ : 0;
break;
case winmethod_Below:
- child2.height = win->constraint_size * win->key_window->unit_height;
+ child2.height = win->key_window?
+ win->constraint_size * win->key_window->unit_height
+ : 0;
break;
}
}
if((win->split_method & winmethod_DivisionMask) == winmethod_Fixed)
{
+ /* If the key window has been closed, then default to 0; otherwise
+ use the key window to determine the size */
switch(win->split_method & winmethod_DirMask)
{
case winmethod_Left:
- child1.width = CLAMP(win->constraint_size * win->key_window->unit_width, 0, allocation->width - spacing);
+ child1.width = win->key_window?
+ CLAMP(win->constraint_size * win->key_window->unit_width, 0, allocation->width - spacing)
+ : 0;
break;
case winmethod_Right:
- child2.width = CLAMP(win->constraint_size * win->key_window->unit_width, 0, allocation->width - spacing);
+ child2.width = win->key_window?
+ CLAMP(win->constraint_size * win->key_window->unit_width, 0, allocation->width - spacing)
+ : 0;
break;
case winmethod_Above:
- child1.height = CLAMP(win->constraint_size * win->key_window->unit_height, 0, allocation->height - spacing);
+ child1.height = win->key_window?
+ CLAMP(win->constraint_size * win->key_window->unit_height, 0, allocation->height - spacing)
+ : 0;
break;
case winmethod_Below:
- child2.height = CLAMP(win->constraint_size * win->key_window->unit_height, 0, allocation->height - spacing);
+ child2.height = win->key_window?
+ CLAMP(win->constraint_size * win->key_window->unit_height, 0, allocation->height - spacing)
+ : 0;
break;
}
}
for(line = 0; line < win->height; line++)
{
gtk_text_buffer_get_iter_at_line(textbuffer, &start, line);
- if(line > newheight)
+ /* If this line is going to fall off the bottom, delete it */
+ if(line >= newheight)
{
end = start;
gtk_text_iter_forward_to_line_end(&end);
gtk_text_buffer_delete(textbuffer, &start, &end);
break;
}
+ /* If this line is not long enough, add spaces on the end */
if(newwidth > win->width)
{
gchar *spaces = g_strnfill(newwidth - win->width, ' ');
gtk_text_buffer_insert(textbuffer, &start, spaces, -1);
g_free(spaces);
}
+ /* But if it's too long, delete characters from the end */
else if(newwidth < win->width)
{
end = start;
gtk_text_iter_forward_to_line_end(&end);
gtk_text_buffer_delete(textbuffer, &start, &end);
}
+ /* Note: if the widths are equal, do nothing */
}
+ /* Add blank lines if there aren't enough lines to fit the new size */
if(newheight > win->height)
{
gchar *blanks = g_strnfill(win->width, ' ');