Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk...
[blender-staging.git] / source / blender / editors / screen / area.c
index 82986dfbcc4b82b5a462aaa2321f549ee33cbc88..8bb808f9641fca856355c391ddbe128075587c85 100644 (file)
 
 /* general area and region code */
 
-static void region_draw_emboss(ARegion *ar, rcti *scirct)
-{
-       rcti rect;
-       
-       /* translate scissor rect to region space */
-       rect.xmin= scirct->xmin - ar->winrct.xmin;
-       rect.ymin= scirct->ymin - ar->winrct.ymin;
-       rect.xmax= scirct->xmax - ar->winrct.xmin;
-       rect.ymax= scirct->ymax - ar->winrct.ymin;
-       
-       /* set transp line */
-       glEnable( GL_BLEND );
-       glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-       
-       /* right  */
-       glColor4ub(0,0,0, 50);
-       sdrawline(rect.xmax, rect.ymin, rect.xmax, rect.ymax);
-       
-       /* bottom  */
-       glColor4ub(0,0,0, 80);
-       sdrawline(rect.xmin, rect.ymin, rect.xmax, rect.ymin);
-       
-       /* top  */
-       glColor4ub(255,255,255, 60);
-       sdrawline(rect.xmin, rect.ymax, rect.xmax, rect.ymax);
-
-       /* left  */
-       glColor4ub(255,255,255, 50);
-       sdrawline(rect.xmin, rect.ymin, rect.xmin, rect.ymax);
-       
-       glDisable( GL_BLEND );
-}
-
 void ED_region_pixelspace(ARegion *ar)
 {
        int width= ar->winrct.xmax-ar->winrct.xmin+1;
@@ -169,25 +136,17 @@ void ED_area_overdraw_flush(ScrArea *sa, ARegion *ar)
 
 static void area_draw_azone(short x1, short y1, short x2, short y2)
 {
-       int dx= floor(0.3f*(x2-x1));
-       int dy= floor(0.3f*(y2-y1));
-       
-       glColor4ub(255, 255, 255, 180);
-       fdrawline(x1, y2, x2, y1);
-       glColor4ub(255, 255, 255, 130);
-       fdrawline(x1, y2-dy, x2-dx, y1);
-       glColor4ub(255, 255, 255, 80);
-       fdrawline(x1, y2-2*dy, x2-2*dx, y1);
-       
-       glColor4ub(0, 0, 0, 210);
-       fdrawline(x1, y2+1, x2+1, y1);
-       glColor4ub(0, 0, 0, 180);
-       fdrawline(x1, y2-dy+1, x2-dx+1, y1);
-       glColor4ub(0, 0, 0, 150);
-       fdrawline(x1, y2-2*dy+1, x2-2*dx+1, y1);
+       int dx= floor(0.9f*(x2-x1));
+       int dy= floor(0.9f*(y2-y1));
+
+       glColor4f(0.0f, 0.0f, 0.0f, 0.25f);
+       glBegin(GL_TRIANGLES);
+       glVertex2f(x1, y1);
+       glVertex2f(x1+dx, y1);
+       glVertex2f(x1, y1+dy);
+       glEnd();
 }
 
-
 static void region_draw_azone_icon(AZone *az)
 {
        GLUquadricObj *qobj = NULL; 
@@ -316,6 +275,7 @@ void ED_area_overdraw(bContext *C)
                                if(az->type==AZONE_AREA) {
                                        area_draw_azone(az->x1, az->y1, az->x2, az->y2);
                                } else if(az->type==AZONE_REGION) {
+                                       if(0) {
                                        
                                        if(az->ar) {
                                                /* only display tab or icons when the region is hidden */
@@ -329,6 +289,8 @@ void ED_area_overdraw(bContext *C)
                                                                region_draw_azone_icon(az);
                                                }
                                        }
+
+                                       }
                                }
                                
                                az->do_draw= 0;
@@ -414,6 +376,9 @@ void ED_region_do_draw(bContext *C, ARegion *ar)
        
        /* note; this sets state, so we can use wmOrtho and friends */
        wmSubWindowScissorSet(win, ar->swinid, &ar->drawrct);
+
+       ar->do_draw= 0;
+       memset(&ar->drawrct, 0, sizeof(ar->drawrct));
        
        UI_SetTheme(sa?sa->spacetype:0, ar->type?ar->type->regionid:0);
        
@@ -433,14 +398,11 @@ void ED_region_do_draw(bContext *C, ARegion *ar)
        
        uiFreeInactiveBlocks(C, &ar->uiblocks);
        
-       if(sa)
-               region_draw_emboss(ar, &winrct);
+       /*if(sa)
+               region_draw_emboss(ar, &winrct);*/
        
        /* XXX test: add convention to end regions always in pixel space, for drawing of borders/gestures etc */
        ED_region_pixelspace(ar);
-       
-       ar->do_draw= 0;
-       memset(&ar->drawrct, 0, sizeof(ar->drawrct));
 }
 
 /* **********************************
@@ -600,65 +562,6 @@ static void region_azone_edge(AZone *az, ARegion *ar)
        BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y2);
 }
 
-static void region_azone_icon(ScrArea *sa, AZone *az, ARegion *ar)
-{
-       AZone *azt;
-       int tot=0;
-       
-       /* count how many actionzones with along same edge are available.
-          This allows for adding more action zones in the future without
-          having to worry about correct offset */
-       for(azt= sa->actionzones.first; azt; azt= azt->next) {
-               if(azt->edge == az->edge) tot++;
-       }
-       
-       switch(az->edge) {
-               case AE_TOP_TO_BOTTOMRIGHT:
-                       az->x1= ar->winrct.xmax - tot*2*AZONEPAD_ICON;
-                       az->y1= ar->winrct.ymax + AZONEPAD_ICON;
-                       az->x2= ar->winrct.xmax - tot*AZONEPAD_ICON;
-                       az->y2= ar->winrct.ymax + 2*AZONEPAD_ICON;
-                       break;
-               case AE_BOTTOM_TO_TOPLEFT:
-                       az->x1= ar->winrct.xmin + AZONEPAD_ICON;
-                       az->y1= ar->winrct.ymin - 2*AZONEPAD_ICON;
-                       az->x2= ar->winrct.xmin + 2*AZONEPAD_ICON;
-                       az->y2= ar->winrct.ymin - AZONEPAD_ICON;
-                       break;
-               case AE_LEFT_TO_TOPRIGHT:
-                       az->x1= ar->winrct.xmin - 2*AZONEPAD_ICON;
-                       az->y1= ar->winrct.ymax - tot*2*AZONEPAD_ICON;
-                       az->x2= ar->winrct.xmin - AZONEPAD_ICON;
-                       az->y2= ar->winrct.ymax - tot*AZONEPAD_ICON;
-                       break;
-               case AE_RIGHT_TO_TOPLEFT:
-                       az->x1= ar->winrct.xmax + AZONEPAD_ICON;
-                       az->y1= ar->winrct.ymax - tot*2*AZONEPAD_ICON;
-                       az->x2= ar->winrct.xmax + 2*AZONEPAD_ICON;
-                       az->y2= ar->winrct.ymax - tot*AZONEPAD_ICON;
-                       break;
-       }
-
-       BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y2);
-       
-       /* if more azones on 1 spot, set offset */
-       for(azt= sa->actionzones.first; azt; azt= azt->next) {
-               if(az!=azt) {
-                       if( ABS(az->x1-azt->x1) < 2 && ABS(az->y1-azt->y1) < 2) {
-                               if(az->edge==AE_TOP_TO_BOTTOMRIGHT || az->edge==AE_BOTTOM_TO_TOPLEFT) {
-                                       az->x1+= AZONESPOT;
-                                       az->x2+= AZONESPOT;
-                               }
-                               else{
-                                       az->y1-= AZONESPOT;
-                                       az->y2-= AZONESPOT;
-                               }
-                               BLI_init_rcti(&az->rect, az->x1, az->x2, az->y1, az->y2);
-                       }
-               }
-       }
-}
-
 #define AZONEPAD_TABW  18
 #define AZONEPAD_TABH  7
 
@@ -751,28 +654,19 @@ static void region_azone_tria(ScrArea *sa, AZone *az, ARegion *ar)
 
 static void region_azone_initialize(ScrArea *sa, ARegion *ar, AZEdge edge) 
 {
-       AZone *az;
-       
-       az= (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
-       BLI_addtail(&(sa->actionzones), az);
-       az->type= AZONE_REGION;
-       az->ar= ar;
-       az->edge= edge;
-       
-       if (ar->flag & (RGN_FLAG_HIDDEN|RGN_FLAG_TOO_SMALL)) {
-               if(G.rt==2)
-                       region_azone_tria(sa, az, ar);
-               else if(G.rt==1)
-                       region_azone_tab(sa, az, ar);
-               else
-                       region_azone_icon(sa, az, ar);
-       } else {
+       if(!(ar->flag & RGN_FLAG_HIDDEN)) {
+               AZone *az;
+               
+               az= (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
+               BLI_addtail(&(sa->actionzones), az);
+               az->type= AZONE_REGION;
+               az->ar= ar;
+               az->edge= edge;
+               
                region_azone_edge(az, ar);
        }
-       
 }
 
-
 /* *************************************************************** */
 
 static void region_azone_add(ScrArea *sa, ARegion *ar, int alignment)
@@ -1406,6 +1300,7 @@ int ED_area_header_switchbutton(const bContext *C, uiBlock *block, int yco)
                                                   "Displays current editor type. "
                                                   "Click for menu of available types");
        uiButSetFunc(but, spacefunc, NULL, NULL);
+       uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */
        
        return xco + UI_UNIT_X + 14;
 }
@@ -1414,6 +1309,7 @@ int ED_area_header_standardbuttons(const bContext *C, uiBlock *block, int yco)
 {
        ScrArea *sa= CTX_wm_area(C);
        int xco= 8;
+       uiBut *but;
        
        if (!sa->full)
                xco= ED_area_header_switchbutton(C, block, yco);
@@ -1421,20 +1317,22 @@ int ED_area_header_standardbuttons(const bContext *C, uiBlock *block, int yco)
        uiBlockSetEmboss(block, UI_EMBOSSN);
 
        if (sa->flag & HEADER_NO_PULLDOWN) {
-               uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, 
+               but= uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0,
                                                 ICON_DISCLOSURE_TRI_RIGHT,
                                                 xco,yco,UI_UNIT_X,UI_UNIT_Y-2,
                                                 &(sa->flag), 0, 0, 0, 0, 
                                                 "Show pulldown menus");
        }
        else {
-               uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, 
+               but= uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0,
                                                 ICON_DISCLOSURE_TRI_DOWN,
                                                 xco,yco,UI_UNIT_X,UI_UNIT_Y-2,
                                                 &(sa->flag), 0, 0, 0, 0, 
                                                 "Hide pulldown menus");
        }
 
+       uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */
+
        uiBlockSetEmboss(block, UI_EMBOSS);
        
        return xco + UI_UNIT_X;
@@ -1442,28 +1340,15 @@ int ED_area_header_standardbuttons(const bContext *C, uiBlock *block, int yco)
 
 /************************ standard UI regions ************************/
 
-void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char *context, int contextnr)
+static void region_panels_layout(const bContext *C, ARegion *ar, int vertical, const char *context, int w, int em, int *r_x, int *r_y)
 {
        ScrArea *sa= CTX_wm_area(C);
-       uiStyle *style= U.uistyles.first;
-       uiBlock *block;
        PanelType *pt;
        Panel *panel;
-       View2D *v2d= &ar->v2d;
-       View2DScrollers *scrollers;
-       int xco, yco, x, y, miny=0, w, em, header, triangle, open, newcontext= 0;
-
-       if(contextnr >= 0)
-               newcontext= UI_view2d_tab_set(v2d, contextnr);
-
-       if(vertical) {
-               w= v2d->cur.xmax - v2d->cur.xmin;
-               em= (ar->type->prefsizex)? UI_UNIT_Y/2: UI_UNIT_Y;
-       }
-       else {
-               w= UI_PANEL_WIDTH;
-               em= (ar->type->prefsizex)? UI_UNIT_Y/2: UI_UNIT_Y;
-       }
+       uiBlock *block;
+       uiStyle *style= U.uistyles.first;
+       int x, y, miny=0, xco, yco;
+       int open, header, triangle;
 
        x= 0;
        y= -style->panelouter;
@@ -1471,9 +1356,6 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char *
        /* create panels */
        uiBeginPanels(C, ar);
 
-       /* set view2d view matrix for scrolling (without scrollers) */
-       UI_view2d_view_ortho(v2d);
-
        for(pt= ar->type->paneltypes.first; pt; pt= pt->next) {
                /* verify context */
                if(context)
@@ -1558,6 +1440,40 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char *
                y= UI_PANEL_WIDTH;
        }
 
+       uiEndPanels(C, ar);
+
+       *r_x = x;
+       *r_y = y;
+}
+
+void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char *context, int contextnr)
+{
+       View2D *v2d= &ar->v2d;
+       View2DScrollers *scrollers;
+       int x, y, w, em, newcontext= 0, need_scrollers;
+
+       if(contextnr >= 0)
+               newcontext= UI_view2d_tab_set(v2d, contextnr);
+
+       if(vertical) {
+               w= v2d->cur.xmax - v2d->cur.xmin;
+               em= (ar->type->prefsizex)? UI_UNIT_Y/2: UI_UNIT_Y;
+       }
+       else {
+               w= UI_PANEL_WIDTH;
+               em= (ar->type->prefsizex)? UI_UNIT_Y/2: UI_UNIT_Y;
+       }
+
+       /* try to draw without scrollbars */
+       UI_view2d_view_ortho(v2d);
+
+       region_panels_layout(C, ar, vertical, context, ar->winx, em, &x, &y);
+
+       /* if it doesn't fit, draw again in smaller space with scrollers */
+       need_scrollers = (abs(y) > ar->winy);
+       if(need_scrollers)
+               region_panels_layout(C, ar, vertical, context, ar->winx-V2D_SCROLL_WIDTH, em, &x, &y);
+
        /* clear */
        UI_ThemeClearColor((ar->type->regionid == RGN_TYPE_PREVIEW)?TH_PREVIEW_BACK:TH_BACK);
        glClear(GL_COLOR_BUFFER_BIT);
@@ -1567,8 +1483,9 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char *
                /* only allow scrolling in vertical direction */
                v2d->keepofs |= V2D_LOCKOFS_X|V2D_KEEPOFS_Y;
                v2d->keepofs &= ~(V2D_LOCKOFS_Y|V2D_KEEPOFS_X);
-               v2d->scroll |= V2D_SCROLL_HORIZONTAL_HIDE;
-               v2d->scroll &= ~V2D_SCROLL_VERTICAL_HIDE;
+               v2d->scroll &= ~(V2D_SCROLL_HORIZONTAL_HIDE|V2D_SCROLL_VERTICAL_HIDE);
+               if(!need_scrollers)
+                       v2d->scroll |= V2D_SCROLL_HORIZONTAL_HIDE;
                
                // don't jump back when panels close or hide
                if(!newcontext)
@@ -1583,8 +1500,9 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char *
                v2d->keepofs &= ~(V2D_LOCKOFS_X|V2D_LOCKOFS_Y|V2D_KEEPOFS_X|V2D_KEEPOFS_Y);
                //v2d->keepofs |= V2D_LOCKOFS_Y|V2D_KEEPOFS_X;
                //v2d->keepofs &= ~(V2D_LOCKOFS_X|V2D_KEEPOFS_Y);
-               v2d->scroll |= V2D_SCROLL_VERTICAL_HIDE;
-               v2d->scroll &= ~V2D_SCROLL_HORIZONTAL_HIDE;
+               v2d->scroll &= ~(V2D_SCROLL_HORIZONTAL_HIDE|V2D_SCROLL_VERTICAL_HIDE);
+               if(!need_scrollers)
+                       v2d->scroll |= V2D_SCROLL_VERTICAL_HIDE;
                
                // don't jump back when panels close or hide
                if(!newcontext)
@@ -1594,20 +1512,23 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char *
 
        // +V2D_SCROLL_HEIGHT is workaround to set the actual height
        UI_view2d_totRect_set(v2d, x+V2D_SCROLL_WIDTH, y+V2D_SCROLL_HEIGHT);
+       UI_view2d_totRect_set(v2d, x+V2D_SCROLL_WIDTH, y+V2D_SCROLL_HEIGHT);
 
        /* set the view */
        UI_view2d_view_ortho(v2d);
 
        /* this does the actual drawing! */
-       uiEndPanels(C, ar);
+       uiDrawPanels(C, ar);
        
        /* restore view matrix */
        UI_view2d_view_restore(C);
        
        /* scrollers */
-       scrollers= UI_view2d_scrollers_calc(C, v2d, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
-       UI_view2d_scrollers_draw(C, v2d, scrollers);
-       UI_view2d_scrollers_free(scrollers);
+       if(need_scrollers) {
+               scrollers= UI_view2d_scrollers_calc(C, v2d, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
+               UI_view2d_scrollers_draw(C, v2d, scrollers);
+               UI_view2d_scrollers_free(scrollers);
+       }
 }
 
 void ED_region_panels_init(wmWindowManager *wm, ARegion *ar)