Fix #114861: Add NLA region padding if markers are present. #115213

Nate Rupsis · 2023-11-20T23:05:41+01:00

Nate Rupsis commented

2023-11-20 23:05:41 +01:00

With the changes in #109473, the bottom strip is now hidden if markers are present.

This fix adds region padding to the NLA if markers are present.

Before:

After:

With the changes in #109473, the bottom strip is now hidden if markers are present. This fix adds region padding to the NLA if markers are present. Before: ![image](/attachments/76719154-edc2-43cc-8ba0-1d13ba134395) After: ![image](/attachments/9873c9fc-a4e2-40d0-bdd5-2552f953b36e)

image.png

31 KiB

image.png

40 KiB

Nate Rupsis added the

Module

Animation & Rigging

label 2023-11-20 23:05:41 +01:00

Nate Rupsis added 1 commit 2023-11-20 23:05:53 +01:00

a749209e49 add region padding to NLA region if markers are present.

Nate Rupsis requested review from Harley Acheson 2023-11-20 23:08:01 +01:00

Nate Rupsis requested review from Christoph Lendenfeld 2023-11-20 23:08:02 +01:00

Nate Rupsis requested review from Nathan Vegdahl 2023-11-20 23:08:12 +01:00

Christoph Lendenfeld approved these changes 2023-11-21 10:29:25 +01:00

Christoph Lendenfeld left a comment

lgtm

Nathan Vegdahl approved these changes 2023-11-21 13:50:37 +01:00

Nathan Vegdahl left a comment

Looks good to me.

Hans Goudey changed title from ~~FIX #114861: Add NLA region padding if markers are present.~~ to Fix #114861: Add NLA region padding if markers are present.

2023-11-21 18:35:19 +01:00

Harley Acheson commented

2023-11-21 22:04:46 +01:00

Sorry if a little picky, but the use of UI_ICON_SIZE is just a bit too unrelated to the sizes here. It is just coincidence that UI_ICON_SIZE (16 pixels at 1X scale) is close to the actual minimum change of 15.

I'd change that to the following so that the marker area size and the row height can change in the future:

v2d->tot.ymin -= (UI_MARKER_MARGIN_Y - NLACHANNEL_STEP(snla));

But note that because of some rounding the above can sometimes give you a pixel more than you actually need, but that shouldn't matter; as long as it isn't less than you need.

Sorry if a little picky, but the use of UI_ICON_SIZE is just a bit too unrelated to the sizes here. It is just coincidence that UI_ICON_SIZE (16 pixels at 1X scale) is close to the actual minimum change of 15. I'd change that to the following so that the marker area size and the row height can change in the future: ``` v2d->tot.ymin -= (UI_MARKER_MARGIN_Y - NLACHANNEL_STEP(snla)); ``` But note that because of some rounding the above can sometimes give you a pixel more than you actually need, but that shouldn't matter; as long as it isn't less than you need.

Nate Rupsis added 3 commits 2023-11-22 00:43:30 +01:00

38a583bc35 cleanup

28d0f49fdf Merge branch 'main' into 114861-nla-markers-stuck

f313690162 using Marker margin & channel height to get correct padding for NLA Track

Harley Acheson approved these changes 2023-11-22 03:09:45 +01:00

Harley Acheson left a comment

Awesome!

Nate Rupsis merged commit 18ec3679f6 into main

2023-11-22 21:01:27 +01:00

Nate Rupsis deleted branch 114861-nla-markers-stuck

2023-11-22 21:01:29 +01:00

Nate Rupsis referenced this issue from a commit