diff options
| author | Ton Roosendaal <ton@blender.org> | 2003-09-17 15:22:21 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2003-09-17 15:22:21 +0400 |
| commit | de2b6cc89f3bd480830657e33a1dc387a6369984 (patch) | |
| tree | 838d51c416c1cd6f98a1b9a6f73111984b7d5aea | |
| parent | bcd01942d8510aa561ab7c247655a286eff224e9 (diff) | |
- fix bug 496
when you choose a window with no header, go to 'full window mode',
sometimes the header was still drawn. fixed it with a more strict
test in the drawing call.
| -rw-r--r-- | source/blender/src/editscreen.c | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c index cd3b3ee2315..ae72b10dce8 100644 --- a/source/blender/src/editscreen.c +++ b/source/blender/src/editscreen.c @@ -323,27 +323,29 @@ int area_is_active_area(ScrArea *area) void scrarea_do_headdraw(ScrArea *area) { - areawinset(area->headwin); - - headerbox(area_is_active_area(area), area->winx+100); - - switch(area->spacetype) { - case SPACE_FILE: file_buttons(); break; - case SPACE_INFO: info_buttons(); break; - case SPACE_VIEW3D: view3d_buttons(); break; - case SPACE_IPO: ipo_buttons(); break; - case SPACE_BUTS: buts_buttons(); break; - case SPACE_SEQ: seq_buttons(); break; - case SPACE_IMAGE: image_buttons(); break; - case SPACE_IMASEL: imasel_buttons(); break; - case SPACE_OOPS: oops_buttons(); break; - case SPACE_TEXT: text_buttons(); break; - case SPACE_SOUND: sound_buttons(); break; - case SPACE_ACTION: action_buttons(); break; - case SPACE_NLA: nla_buttons(); break; + if (area->headertype) { + areawinset(area->headwin); + + headerbox(area_is_active_area(area), area->winx+100); + + switch(area->spacetype) { + case SPACE_FILE: file_buttons(); break; + case SPACE_INFO: info_buttons(); break; + case SPACE_VIEW3D: view3d_buttons(); break; + case SPACE_IPO: ipo_buttons(); break; + case SPACE_BUTS: buts_buttons(); break; + case SPACE_SEQ: seq_buttons(); break; + case SPACE_IMAGE: image_buttons(); break; + case SPACE_IMASEL: imasel_buttons(); break; + case SPACE_OOPS: oops_buttons(); break; + case SPACE_TEXT: text_buttons(); break; + case SPACE_SOUND: sound_buttons(); break; + case SPACE_ACTION: action_buttons(); break; + case SPACE_NLA: nla_buttons(); break; + } + + area->head_swap= WIN_BACK_OK; } - - area->head_swap= WIN_BACK_OK; } void scrarea_do_headchange(ScrArea *area) { @@ -351,7 +353,7 @@ void scrarea_do_headchange(ScrArea *area) if (area->headertype==HEADERDOWN) { bwin_ortho2(area->headwin, 0.5+ofs, area->headrct.xmax-area->headrct.xmin-0.5+ofs, +0.6, area->headrct.ymax-area->headrct.ymin+0.6); - } else { + } else if (area->headertype==HEADERTOP) { bwin_ortho2(area->headwin, -0.5+ofs, area->headrct.xmax-area->headrct.xmin-0.5+ofs, -0.5, area->headrct.ymax-area->headrct.ymin-0.5); } } |