kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

IRC bugreport:

Browse Source 
Splitting/joining editors (areas) was possible in full-screen mode.
That's not possible, crashes on going back to previous.
This commit is contained in:
Ton Roosendaal 2011-03-23 16:36:41 +00:00
parent a94e9c5955
commit 7cef4ea008
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/screen/screen_ops.c
View File

@ -108,6 +108,17 @@ int ED_operator_screenactive(bContext *C)
return 1;
}
static int screen_active_editable(bContext *C)
{
if(ED_operator_screenactive(C)) {
/* no full window splitting allowed */
if(CTX_wm_screen(C)->full != SCREENNORMAL)
return 0;
return 1;
}
return 0;
}
/* when mouse is over area-edge */
int ED_operator_screen_mainwinactive(bContext *C)
{
@ -1263,6 +1274,10 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event)
sAreaSplitData *sd;
int dir;
/* no full window splitting allowed */
if(CTX_wm_screen(C)->full != SCREENNORMAL)
return OPERATOR_CANCELLED;
if(event->type==EVT_ACTIONZONE_AREA) {
sActionzoneData *sad= event->customdata;
@ -1270,7 +1285,6 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event)
return OPERATOR_PASS_THROUGH;
}
/* verify *sad itself */
if(sad==NULL || sad->sa1==NULL || sad->az==NULL)
return OPERATOR_PASS_THROUGH;
@ -1299,10 +1313,6 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event)
ScrEdge *actedge;
int x, y;
/* no full window splitting allowed */
if(CTX_wm_area(C) && CTX_wm_area(C)->full)
return OPERATOR_CANCELLED;
/* retrieve initial mouse coord, so we can find the active edge */
if(RNA_property_is_set(op->ptr, "mouse_x"))
x= RNA_int_get(op->ptr, "mouse_x");
@ -1471,7 +1481,7 @@ static void SCREEN_OT_area_split(wmOperatorType *ot)
ot->invoke= area_split_invoke;
ot->modal= area_split_modal;
ot->poll= ED_operator_screenactive;
ot->poll= screen_active_editable;
ot->flag= OPTYPE_BLOCKING;
/* rna */
@ -2210,7 +2220,7 @@ static void SCREEN_OT_area_join(wmOperatorType *ot)
ot->exec= area_join_exec;
ot->invoke= area_join_invoke;
ot->modal= area_join_modal;
ot->poll= ED_operator_screenactive;
ot->poll= screen_active_editable;
ot->flag= OPTYPE_BLOCKING;