projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Turned off line wrapping on text grids. They don't need it, since they're always...
[projects/chimara/chimara.git]
/
src
/
chimara-glk.c
diff --git
a/src/chimara-glk.c
b/src/chimara-glk.c
index 889b4f265e041387f5931c7b889e954592a3f397..3e2dabecf20e1abed3494a729b73753902dd8cfd 100644
(file)
--- a/
src/chimara-glk.c
+++ b/
src/chimara-glk.c
@@
-189,16
+189,24
@@
request_recurse(winid_t win, GtkRequisition *requisition, guint spacing)
switch(win->split_method & winmethod_DirMask)
{
case winmethod_Left:
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:
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:
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:
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;
}
}
break;
}
}
@@
-260,19
+268,29
@@
allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
if((win->split_method & winmethod_DivisionMask) == winmethod_Fixed)
{
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:
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:
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:
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:
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;
}
}
break;
}
}
@@
-346,7
+364,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
+373,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
+381,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
+389,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, ' ');