[Bf-blender-cvs] [03b815ec047] temp-vse-channels-edge-panning: VSE: Limit timeline view height
Richard Antalik
noreply at git.blender.org
Thu Mar 24 02:35:45 CET 2022
Commit: 03b815ec0471d7ffc8ac9dea989054ac7327e843
Author: Richard Antalik
Date: Thu Mar 24 02:32:13 2022 +0100
Branches: temp-vse-channels-edge-panning
https://developer.blender.org/rB03b815ec0471d7ffc8ac9dea989054ac7327e843
VSE: Limit timeline view height
Maximum zoom or view height is now defined by space occupied by strips,
But at least channels 1 to 7 will be always visible. This makes it
overview timeline content by zooming out to maximum extent in Y axis
and panning in X axis.
More channels can be "created" on demand by moving strip to higher
channel. When any strip is removed from channel, operators, should use
flag `SPACE_SEQ_CLAMP_SMOOTH` to do smooth transition when limiting
height.
Limiting takes into account height of scrubbing and markers area as
well as scrollers. This means that when zoomed out to maximum extent,
no strips are obstructed by fixed UI element.
Fixes T57976, T90964
Demo:
{F12913337}
Maniphest Tasks: T90964, T57976
Differential Revision: https://developer.blender.org/D14263
===================================================================
M source/blender/blenloader/intern/versioning_300.c
M source/blender/editors/animation/time_scrub_ui.c
M source/blender/editors/include/ED_time_scrub_ui.h
M source/blender/editors/include/UI_view2d.h
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/transform/transform_convert_sequencer.c
M source/blender/makesdna/DNA_space_types.h
M source/blender/sequencer/intern/strip_time.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 2f2a83a1145..c17a57d650f 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -2603,6 +2603,8 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
ARegion *timeline_region = BKE_area_find_region_type(area, RGN_TYPE_WINDOW);
if (timeline_region != NULL) {
timeline_region->v2d.flag |= V2D_VIEWSYNC_AREA_VERTICAL;
+ timeline_region->v2d.cur.ymax = 8.5f;
+ timeline_region->v2d.align &= ~V2D_ALIGN_NO_NEG_Y;
}
}
}
diff --git a/source/blender/editors/animation/time_scrub_ui.c b/source/blender/editors/animation/time_scrub_ui.c
index 3a780b32398..5e6950acf21 100644
--- a/source/blender/editors/animation/time_scrub_ui.c
+++ b/source/blender/editors/animation/time_scrub_ui.c
@@ -31,7 +31,7 @@
#include "RNA_access.h"
-static void get_time_scrub_region_rect(const ARegion *region, rcti *rect)
+void ED_time_scrub_region_rect_get(const ARegion *region, rcti *rect)
{
rect->xmin = 0;
rect->xmax = region->winx;
@@ -153,7 +153,7 @@ void ED_time_scrub_draw_current_frame(const ARegion *region,
wmOrtho2_region_pixelspace(region);
rcti scrub_region_rect;
- get_time_scrub_region_rect(region, &scrub_region_rect);
+ ED_time_scrub_region_rect_get(region, &scrub_region_rect);
draw_current_frame(scene, display_seconds, v2d, &scrub_region_rect, scene->r.cfra);
GPU_matrix_pop_projection();
@@ -170,7 +170,7 @@ void ED_time_scrub_draw(const ARegion *region,
wmOrtho2_region_pixelspace(region);
rcti scrub_region_rect;
- get_time_scrub_region_rect(region, &scrub_region_rect);
+ ED_time_scrub_region_rect_get(region, &scrub_region_rect);
draw_background(&scrub_region_rect);
diff --git a/source/blender/editors/include/ED_time_scrub_ui.h b/source/blender/editors/include/ED_time_scrub_ui.h
index 596fdd87afc..efc972ef69d 100644
--- a/source/blender/editors/include/ED_time_scrub_ui.h
+++ b/source/blender/editors/include/ED_time_scrub_ui.h
@@ -14,6 +14,7 @@ extern "C" {
struct bContext;
struct bDopeSheet;
struct wmEvent;
+struct rcti;
void ED_time_scrub_draw_current_frame(const struct ARegion *region,
const struct Scene *scene,
@@ -29,6 +30,7 @@ bool ED_time_scrub_event_in_region(const struct ARegion *region, const struct wm
void ED_time_scrub_channel_search_draw(const struct bContext *C,
struct ARegion *region,
struct bDopeSheet *dopesheet);
+void ED_time_scrub_region_rect_get(const struct ARegion *region, struct rcti *rect);
#ifdef __cplusplus
}
diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h
index 49f035ab2d8..3bcf0481044 100644
--- a/source/blender/editors/include/UI_view2d.h
+++ b/source/blender/editors/include/UI_view2d.h
@@ -447,7 +447,7 @@ typedef struct View2DEdgePanData {
struct ARegion *region;
/** View2d we're operating in. */
struct View2D *v2d;
- /* Limit maximum pannable area */
+ /* Limit maximum pannable area */
struct rctf limit;
/** Panning should only start once being in the inside rect once (e.g. adding nodes can happen
@@ -493,6 +493,11 @@ void UI_view2d_edge_pan_init(struct bContext *C,
float max_speed,
float delay,
float zoom_influence);
+/**
+ * Set area which can be panned
+ */
+void UI_view2d_edge_pan_set_limits(
+ struct View2DEdgePanData *vpd, float xmin, float xmax, float ymin, float ymax);
/**
* Set area which can be panned
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 8a5e6b404b5..45e51edd782 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -1771,23 +1771,10 @@ static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op))
DEG_id_tag_update(&scene->id, ID_RECALC_SEQUENCER_STRIPS);
DEG_relations_tag_update(bmain);
WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
- return OPERATOR_FINISHED;
-}
-
-static int sequencer_delete_invoke(bContext *C, wmOperator *op, const wmEvent *event)
-{
- ARegion *region = CTX_wm_region(C);
-
- if (region->regiontype == RGN_TYPE_WINDOW) {
- /* Bounding box of 30 pixels is used for markers shortcuts,
- * prevent conflict with markers shortcuts here.
- */
- if (event->mval[1] <= 30) {
- return OPERATOR_PASS_THROUGH;
- }
- }
+ SpaceSeq *sseq = CTX_wm_space_seq(C);
+ sseq->flag |= SPACE_SEQ_CLAMP_SMOOTH;
- return sequencer_delete_exec(C, op);
+ return OPERATOR_FINISHED;
}
void SEQUENCER_OT_delete(wmOperatorType *ot)
@@ -1799,7 +1786,6 @@ void SEQUENCER_OT_delete(wmOperatorType *ot)
ot->description = "Erase selected strips from the sequencer";
/* Api callbacks. */
- ot->invoke = sequencer_delete_invoke;
ot->exec = sequencer_delete_exec;
ot->poll = sequencer_edit_poll;
diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c
index 4d245b9ddaa..445daf6072c 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.c
+++ b/source/blender/editors/space_sequencer/sequencer_view.c
@@ -30,6 +30,7 @@
#include "ED_anim_api.h"
#include "ED_screen.h"
#include "ED_util_imbuf.h"
+#include "ED_time_scrub_ui.h"
/* Own include. */
#include "sequencer_intern.h"
@@ -84,6 +85,16 @@ static int sequencer_view_all_exec(bContext *C, wmOperator *op)
box.xmax = ms->disp_range[1] + 1;
}
SEQ_timeline_expand_boundbox(SEQ_active_seqbase_get(ed), &box);
+
+ View2D *v2d = ®ion->v2d;
+ rcti scrub_rect;
+ ED_time_scrub_region_rect_get(region, &scrub_rect);
+ const float pixel_view_size_y = BLI_rctf_size_y(&v2d->cur) / BLI_rcti_size_y(&v2d->mask);
+ const float scrub_bar_height = BLI_rcti_size_y(&scrub_rect) * pixel_view_size_y;
+
+ /* Channel n has range of <n, n+1>. */
+ box.ymax += 1.0f + scrub_bar_height;
+
UI_view2d_smooth_view(C, region, &box, smooth_viewtx);
return OPERATOR_FINISHED;
}
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 77d6831fea0..fa73ea5b9d4 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -18,6 +18,7 @@
#include "BLI_blenlib.h"
#include "BLI_ghash.h"
+#include "BLI_math_base.h"
#include "BLI_utildefines.h"
#include "BKE_context.h"
@@ -29,8 +30,10 @@
#include "GPU_state.h"
+#include "ED_markers.h"
#include "ED_screen.h"
#include "ED_space_api.h"
+#include "ED_time_scrub_ui.h"
#include "ED_transform.h"
#include "ED_view3d.h"
#include "ED_view3d_offscreen.h" /* Only for sequencer view3d drawing callback. */
@@ -41,6 +44,8 @@
#include "RNA_access.h"
+#include "SEQ_sequencer.h"
+#include "SEQ_time.h"
#include "SEQ_transform.h"
#include "SEQ_utils.h"
@@ -172,7 +177,7 @@ static SpaceLink *sequencer_create(const ScrArea *UNUSED(area), const Scene *sce
region->v2d.tot.xmin = 0.0f;
region->v2d.tot.ymin = 0.0f;
region->v2d.tot.xmax = scene->r.efra;
- region->v2d.tot.ymax = 8.0f;
+ region->v2d.tot.ymax = 8.5f;
region->v2d.cur = region->v2d.tot;
@@ -637,6 +642,93 @@ static void sequencer_main_region_draw_overlay(const bContext *C, ARegion *regio
draw_timeline_seq_display(C, region);
}
+struct View2DScrollers {
+ int vert_min, vert_max; /* vertical scrollbar */
+ int hor_min, hor_max; /* horizontal scrollbar */
+
+ /* These values are written into, even if we don't use them. */
+ rcti _hor, _vert;
+};
+
+static void sequencer_main_clamp_view(const bContext *C, ARegion *region)
+{
+ View2D *v2d = ®ion->v2d;
+ Editing *ed = SEQ_editing_get(CTX_data_scene(C));
+
+ /* Transformation uses edge panning to move view. Also if smooth view is running, don't apply
+ * clamping to prevent overriding this functionality. */
+ if (G.moving || v2d->smooth_timer != NULL) {
+ return;
+ }
+
+ /* Initialize default view with 7 channels, that are visible even if empty. */
+ rctf strip_boundbox;
+ BLI_rctf_init(&strip_boundbox, 0.0f, 0.0f, 1.0f, 7.0f);
+ SEQ_timeline_expand_boundbox(ed->seqbasep, &strip_boundbox);
+
+ /* Clamp Y max. Scrubbing area height must be added, so strips aren't occluded. */
+ rcti scrub_rect;
+ ED_time_scrub_region_rect_get(region, &scrub_rect);
+ const float pixel_view_size_y = BLI_rctf_size_y(&v2d->cur) / BLI_rcti_size_y(&v2d->mask);
+ const float scrub_bar_height = BLI_rcti_size_y(&scrub_rect) * pixel_view_size_y;
+
+ /* Channel n has range of <n, n+1>. */
+ strip_boundbox.ymax += 1.0f + scrub_bar_height;
+
+ /* Clamp Y min. Scroller and marker area height must be added, so strips aren't occluded. */
+ struct View2DScrollers scrollers;
+ UI_view2d_scrollers_calc(v2d, NULL, &scrollers);
+ float scroll_bar_height = scrollers._hor.ymax * pixel_view_size_y;
+
+ ListBase *markers = ED_context_get_markers(C);
+ if (markers != NULL && !BLI_listbase_is_empty(markers)) {
+ float markers_size = UI_MARKER_MARGIN_Y * pixel_view_size_y;
+ strip_boundbox.ymin -= markers_size;
+ }
+ else {
+ strip_boundbox.ymin -= scroll_bar_height;
+ }
+
+ rctf view_clamped = v2d->cur;
+ bool do_clamp = false;
+
+ const float range_y = BLI_rctf_size_y(&view_clamped);
+ if (view_clamped.ymax > strip_boundbox.ymax) {
+ view_clamped.ymax = strip_boundbox.ymax;
+ view_clamped.ymin = max_ff(strip_boundbox.ymin, strip_boundbox.ymax - range_y);
+ do_clamp = true;
+ }
+ if (view_clamped.ymin < strip_boundbox.ymin) {
+ view_clamped.ymin = strip_boundbox.ymin;
+ view_clamped.ymax = min_ff(strip_boundbox.ymax, strip_boundbox.ymin + range_y);
+ do_clamp = true;
+ }
+
+ SpaceSeq *sseq = CTX_wm_space_seq(C);
+ if (do_clamp) {
+ if ((sseq->flag & SPACE_SEQ_CLAMP_SMOOTH) != 0) {
+ UI_view2d_smooth_view(C,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list