Page MenuHome
Files F2704

outliner_hs_04.patch
Public
Actions

outliner_hs_04.patch
View Options

Index: blender/include/BIF_outliner.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/include/BIF_outliner.h,v
retrieving revision 1.15
diff -u -r1.15 BIF_outliner.h
--- blender/include/BIF_outliner.h 8 Nov 2006 12:42:45 -0000 1.15
+++ blender/include/BIF_outliner.h 9 Nov 2006 11:02:53 -0000
@@ -93,6 +93,7 @@
extern void outliner_del(struct ScrArea *sa);
extern void outliner_operation_menu(struct ScrArea *sa);
extern void outliner_page_up_down(struct ScrArea *sa, int up);
+extern void outliner_page_left_right(struct ScrArea *sa, int right);
extern void outliner_find_panel(struct ScrArea *sa, int again, int flags);
#endif
Index: blender/src/drawipo.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawipo.c,v
retrieving revision 1.86
diff -u -r1.86 drawipo.c
--- blender/src/drawipo.c 6 Aug 2006 13:23:22 -0000 1.86
+++ blender/src/drawipo.c 7 Nov 2006 06:19:47 -0000
@@ -2447,12 +2447,6 @@
cursor = BC_NSEW_SCROLLCURSOR;
- /* no x move in outliner */
- if(curarea->spacetype==SPACE_OOPS && G.v2d->scroll) {
- facx= 0.0;
- cursor = BC_NS_SCROLLCURSOR;
- }
-
/* no y move in audio & time */
if ELEM(curarea->spacetype, SPACE_SOUND, SPACE_TIME) {
facy= 0.0;
Index: blender/src/outliner.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/outliner.c,v
retrieving revision 1.82
diff -u -r1.82 outliner.c
--- blender/src/outliner.c 8 Nov 2006 12:03:10 -0000 1.82
+++ blender/src/outliner.c 9 Nov 2006 10:59:39 -0000
@@ -1109,6 +1109,20 @@
scrarea_queue_redraw(sa);
}
+void outliner_page_left_right(ScrArea *sa, int right)
+{
+ SpaceOops *soops= sa->spacedata.first;
+ int dx= soops->v2d.mask.xmax-soops->v2d.mask.xmin;
+
+ if(right == -1) dx= -dx;
+ if (soops->v2d.cur.xmin+dx >= 0) {
+ soops->v2d.cur.xmin= dx;
+ soops->v2d.cur.xmax= dx;
+ }
+
+ scrarea_queue_redraw(sa);
+}
+
/* **** do clicks on items ******* */
static void tree_element_active_object(SpaceOops *soops, TreeElement *te)
@@ -2976,7 +2990,7 @@
/* selection status */
if(tselem->flag & TSE_SELECTED) {
- glRecti(0, *starty+1, (int)soops->v2d.mask.xmax, *starty+OL_H-1);
+ glRecti(soops->v2d.cur.xmin, *starty+1, (int)soops->v2d.cur.xmax, *starty+OL_H-1);
}
*starty-= OL_H;
if((tselem->flag & TSE_CLOSED)==0) outliner_draw_selection(soops, &te->subtree, starty);
@@ -3026,7 +3040,7 @@
ystart= OL_H*(ystart/(OL_H));
while(ystart > soops->v2d.cur.ymin) {
- glRecti(0, ystart, (int)soops->v2d.mask.xmax, ystart+OL_H);
+ glRecti((int)soops->v2d.cur.xmin, ystart, (int)soops->v2d.cur.xmax, ystart+OL_H);
ystart-= 2*OL_H;
}
}
@@ -3181,6 +3195,16 @@
myortho2(G.v2d->cur.xmin-0.375, G.v2d->cur.xmax-0.375, G.v2d->cur.ymin-0.375, G.v2d->cur.ymax-0.375);
+ /* prevent scrolls from going too far */
+ if (G.v2d->cur.xmin < 0) {
+ G.v2d->cur.xmin= 0.0;
+ G.v2d->cur.xmax= (G.v2d->mask.xmax-G.v2d->mask.xmin);
+ }
+ else if (G.v2d->cur.ymax > 0) {
+ G.v2d->cur.ymin= -(G.v2d->mask.ymax-G.v2d->mask.ymin);
+ G.v2d->cur.ymax= 0.0;
+ }
+
/* draw outliner stuff */
outliner_back(soops);
outliner_draw_tree(soops);
@@ -3189,7 +3213,7 @@
mywinset(sa->win);
/* ortho corrected */
- myortho2(G.v2d->cur.xmin-SCROLLB-0.375, G.v2d->cur.xmax-0.375, G.v2d->cur.ymin-0.375, G.v2d->cur.ymax-0.375);
+ myortho2(G.v2d->cur.xmin-SCROLLB-0.375, G.v2d->cur.xmax-0.375, G.v2d->cur.ymin-SCROLLB-0.375, G.v2d->cur.ymax-0.375);
block= uiNewBlock(&sa->uiblocks, "outliner buttons", UI_EMBOSS, UI_HELV, sa->win);
outliner_buttons(block, soops, &soops->tree);
Index: blender/src/space.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/space.c,v
retrieving revision 1.394
diff -u -r1.394 space.c
--- blender/src/space.c 9 Nov 2006 08:43:27 -0000 1.394
+++ blender/src/space.c 9 Nov 2006 10:59:59 -0000
@@ -4531,12 +4531,18 @@
case HOMEKEY:
outliner_show_hierarchy(sa);
break;
- case PAGEUPKEY:
- outliner_page_up_down(sa, 1);
- break;
- case PAGEDOWNKEY:
- outliner_page_up_down(sa, -1);
- break;
+ case PAGEUPKEY:
+ if(G.qual==LR_SHIFTKEY)
+ outliner_page_left_right(sa, 1);
+ else
+ outliner_page_up_down(sa, 1);
+ break;
+ case PAGEDOWNKEY:
+ if(G.qual==LR_SHIFTKEY)
+ outliner_page_left_right(sa, -1);
+ else
+ outliner_page_up_down(sa, -1);
+ break;
case RETKEY:
case PADENTER:
@@ -4704,10 +4710,10 @@
v2d->minzoom= 1.0;
v2d->maxzoom= 1.0;
- v2d->scroll= L_SCROLL;
+ v2d->scroll= L_SCROLL+B_SCROLL;
v2d->keepaspect= 1;
v2d->keepzoom= 1;
- v2d->keeptot= 1;
+ v2d->keeptot= 0;
}
else {
v2d->tot.xmin= -28.0;

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
49/d5/cbc760c4efdc7c14a29bf73372d3

Event Timeline