as the right-hand child of W's former parent. So if you split a window vertically into A and
B and then split A (the top half) again into C and D, then C and D would end up below B.
Fixed.
git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@50
ddfedd41-794f-dd11-ae45-
00112f111e67
for(line = 0; line < win->height; line++)
{
gtk_text_buffer_get_iter_at_line(textbuffer, &start, line);
for(line = 0; line < win->height; line++)
{
gtk_text_buffer_get_iter_at_line(textbuffer, &start, line);
+ /* 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);
{
end = start;
gtk_text_iter_forward_to_line_end(&end);
gtk_text_buffer_delete(textbuffer, &start, &end);
break;
}
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, ' ');
if(newwidth > win->width)
{
gchar *spaces = g_strnfill(newwidth - win->width, ' ');
gtk_text_buffer_insert(textbuffer, &start, spaces, -1);
g_free(spaces);
}
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;
else if(newwidth < win->width)
{
end = start;
gtk_text_iter_forward_to_line_end(&end);
gtk_text_buffer_delete(textbuffer, &start, &end);
}
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, ' ');
if(newheight > win->height)
{
gchar *blanks = g_strnfill(win->width, ' ');
/* Insert the new window into the window tree */
if(split->window_node->parent == NULL)
/* Insert the new window into the window tree */
if(split->window_node->parent == NULL)
glk_data->root_window = pair->window_node;
glk_data->root_window = pair->window_node;
- } else {
- g_node_append(split->window_node->parent, pair->window_node);
+ else
+ {
+ if( split->window_node == g_node_first_sibling(split->window_node) )
+ g_node_prepend(split->window_node->parent, pair->window_node);
+ else
+ g_node_append(split->window_node->parent, pair->window_node);
g_node_unlink(split->window_node);
}
/* Place the windows in the correct order */
g_node_unlink(split->window_node);
}
/* Place the windows in the correct order */