projects
/
rodin
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When splitting a window W, the new pair window was always inserted back into the...
[rodin/chimara.git]
/
src
/
chimara-glk.c
diff --git
a/src/chimara-glk.c
b/src/chimara-glk.c
index 889b4f265e041387f5931c7b889e954592a3f397..b7629240b7cc4422b7e8b774003399c2cd2d48be 100644
(file)
--- a/
src/chimara-glk.c
+++ b/
src/chimara-glk.c
@@
-346,7
+346,8
@@
allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
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(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);
{
end = start;
gtk_text_iter_forward_to_line_end(&end);
@@
-354,6
+355,7
@@
allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
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, ' ');
@@
-361,6
+363,7
@@
allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
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;
@@
-368,7
+371,9
@@
allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
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, ' ');