Commit: 1e037295d84ae37458008466f4ecb4d892a91915
Author: Nathan Craddock
Date: Wed Jul 31 22:32:20 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB1e037295d84ae37458008466f4ecb4d892a91915
Merge branch 'soc-2019-outliner' of git.blender.org:blender into
soc-2019-outliner
===================================================================
===================================================================
diff --cc source/blender/editors/space_outliner/outliner_select.c
index 88cedb68604,81aad03be14..342f2346130
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@@ -1769,18 -1769,18 +1769,33 @@@ static TreeElement *find_walk_select_st
}
/* Scroll the outliner when the walk element reaches the top or bottom
boundary */
++<<<<<<< HEAD
+static void outliner_walk_scroll(ARegion *ar, TreeElement *te)
+{
+ /* Account for the header height */
+ int y_max = ar->v2d.cur.ymax - UI_UNIT_Y;
+ int y_min = ar->v2d.cur.ymin;
+
+ /* Scroll if walked position is beyond the border */
+ if (te->ys > y_max) {
+ outliner_scroll_view(ar, te->ys - y_max);
+ }
+ else if (te->ys < y_min) {
+ outliner_scroll_view(ar, -(y_min - te->ys));
++=======
+ static void outliner_walk_scroll(ARegion *ar, TreeElement *te, short
direction)
+ {
+ /* Account for the header height and include a buffer on the borders */
+ int y_max = ar->v2d.cur.ymax - (UI_UNIT_Y * 2);
+ int y_min = ar->v2d.cur.ymin + UI_UNIT_Y;
+
+ /* Scroll if walked position is beyond the buffer */
+ if (te->ys > y_max && direction == OUTLINER_SELECT_WALK_UP) {
+ outliner_scroll_view(ar, UI_UNIT_Y);
+ }
+ else if (te->ys < y_min && direction == OUTLINER_SELECT_WALK_DOWN) {
+ outliner_scroll_view(ar, -UI_UNIT_Y);
++>>>>>>> 7213f1775cdc9139fe49b2574126494e92edf836
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
