Merge branch 'retiming-gizmos2' of https://projects.blender.org/iss/blender into retiming-gizmos2

@@ -0,0 +149,4 @@
+  return rect;
+}
+
+static bool mouse_is_inside_box(const rctf *box, const int mval[2])

@@ -2910,3 +2910,3 @@
         ("wm.context_toggle_enum", {"type": 'TAB', "value": 'PRESS', "ctrl": True},
          {"properties": [("data_path", 'space_data.view_type'), ("value_1", 'SEQUENCER'), ("value_2", 'PREVIEW')]}),
-        ("sequencer.refresh_all", {"type": 'R', "value": 'PRESS', "ctrl": True}, None),
+        ("sequencer.refresh_all", {"type": 'E', "value": 'PRESS', "ctrl": True}, None),

@@ -930,0 +942,4 @@
+        layout.separator()
+
+        layout.operator("sequencer.retiming_segment_speed_set")
+        layout.operator("sequencer.retiming_show")

@@ -1211,2 +1214,4 @@
     }
     FOREACH_NODETREE_END;
+
+    LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {

@@ -124,2 +124,4 @@
   {
     /* Keep this block, even when empty. */
+
+    FROM_DEFAULT_V4_UCHAR(space_sequencer.keytype_keyframe);

@@ -1,4 +1,4 @@
-/* SPDX-FileCopyrightText: 2008 Blender Authors
+/* SPDX-FileCopyrightText: 2008 Blender Foundation

@@ -10,6 +10,7 @@
 
 #include "DNA_sequence_types.h"
 #include "RNA_access.hh"
+#include <BLI_vector.hh>

@@ -555,0 +830,4 @@
+
+  for (auto item : SEQ_retiming_selection_get(SEQ_editing_get(scene)).items()) {
+    strips_to_handle.append_non_duplicates(item.value);
+    item.key->flag |= DELETE_KEY;

@@ -0,0 +1,561 @@
+/* SPDX-FileCopyrightText: 2022 Blender Foundation

@@ -0,0 +148,4 @@
+  return rect;
+}
+
+int left_fake_key_frame_get(const bContext *C, const Sequence *seq)

@@ -0,0 +169,4 @@
+  const View2D *v2d = UI_view2d_fromcontext(C);
+
+  rctf box = keys_box_get(C, seq);
+  box.xmax += RETIME_KEY_MOUSEOVER_THRESHOLD;

@@ -0,0 +49,4 @@
+
+  td2d->loc[0] = SEQ_retiming_key_timeline_frame_get(scene, seq, key);
+  td2d->loc[1] = key->retiming_factor;
+  td2d->loc2d = NULL;

@@ -0,0 +62,4 @@
+  tdseq->orig_timeline_frame = SEQ_retiming_key_timeline_frame_get(scene, seq, key);
+  tdseq->key_index = SEQ_retiming_key_index_get(seq, key);
+
+  td->extra = (void *)tdseq;

@@ -0,0 +101,4 @@
+  TransData *td = tc->data;
+  TransData2D *td2d = tc->data_2d;
+
+  /*for elem*/

@@ -125,2 +121,2 @@
-
-typedef struct SeqRetimingHandle {
+typedef enum eSeqRetimingKeyFlag {
+  SPEED_TRANSITION_IN = (1 << 0),

@@ -0,0 +243,4 @@
+  for (Sequence *seq : sequencer_visible_strips_get(C)) {
+
+    rctf box = keys_box_get(C, seq);
+    box.xmax += RETIME_KEY_MOUSEOVER_THRESHOLD; /* Fix selecting last key. */

@@ -0,0 +502,4 @@
+
+  const SeqRetimingKey *next_key = key + 1;
+  if (key_x_get(scene, seq, next_key) < start_frame || key_x_get(scene, seq, key) > end_frame) {
+    return; /* Label out of strip bounds. */

@@ -0,0 +510,4 @@
+  size_t label_len = label_str_get(seq, key, label_str, sizeof(label_str));
+
+  if (!label_rect_get(C, seq, key, label_str, label_len, &label_rect)) {
+    return; /* Not enough space to draw label. */

@@ -555,0 +879,4 @@
+    }
+
+    strips_to_handle.append_non_duplicates(item.value);
+    item.key->flag |= SEQ_DELETE_KEY;

@@ -0,0 +228,4 @@
+  for (Sequence *seq : sequencer_visible_strips_get(C)) {
+
+    rctf box = keys_box_get(C, seq);
+    box.xmax += RETIME_KEY_MOUSEOVER_THRESHOLD; /* Fix selecting last key. */