projects
/
rodin
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correctly handles what happens when a window that is the key window of another
[rodin/chimara.git]
/
src
/
chimara-glk.c
diff --git
a/src/chimara-glk.c
b/src/chimara-glk.c
index b7629240b7cc4422b7e8b774003399c2cd2d48be..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;
}
}