griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: #137772: Marker area obstructing Keyframe Manipulation

Browse Source 
Adjust keymap poll function of markers keymap. i.e. when no marker
exists, return false from the keymap so marker operations are not
invoked from key press. Also check whether marker region is visible.
If its is hidden, we can skip the markers keymap.

Pull Request: https://projects.blender.org/blender/blender/pulls/137803
This commit is contained in:
Pratik Borhade
2025-04-24 00:07:02 +02:00
committed by Harley Acheson
parent 840ed03d92
commit db700c85d8
1 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/blender/windowmanager/intern/wm_event_system.cc
View File

@@ -4853,11 +4853,50 @@ bool WM_event_handler_region_v2d_mask_poll(const wmWindow * /*win*/,
return event_or_prev_in_rect(event, &rect);
}
bool WM_event_handler_region_marker_poll(const wmWindow * /*win*/,
const ScrArea * /*area*/,
bool WM_event_handler_region_marker_poll(const wmWindow *win,
const ScrArea *area,
const ARegion *region,
const wmEvent *event)
{
switch (area->spacetype) {
case SPACE_ACTION: {
const SpaceAction *saction = static_cast<SpaceAction *>(area->spacedata.first);
if ((saction->flag & SACTION_SHOW_MARKERS) == 0) {
return false;
}
break;
}
case SPACE_GRAPH: {
const SpaceGraph *sgraph = static_cast<SpaceGraph *>(area->spacedata.first);
if ((sgraph->flag & SIPO_SHOW_MARKERS) == 0) {
return false;
}
break;
}
case SPACE_NLA: {
const SpaceNla *snla = static_cast<SpaceNla *>(area->spacedata.first);
if ((snla->flag & SNLA_SHOW_MARKERS) == 0) {
return false;
}
break;
}
case SPACE_SEQ: {
const SpaceSeq *seq = static_cast<SpaceSeq *>(area->spacedata.first);
if ((seq->flag & SEQ_SHOW_MARKERS) == 0) {
return false;
}
break;
}
default:
break;
}
const ListBase *markers = ED_scene_markers_get(WM_window_get_active_scene(win),
const_cast<ScrArea *>(area));
if (BLI_listbase_is_empty(markers)) {
return false;
}
rcti rect = region->winrct;
rect.ymax = rect.ymin + UI_MARKER_MARGIN_Y;
/* TODO: investigate returning `event_or_prev_in_rect(event, &rect)` here.