Text not vertically aligned in CalendarView

[accessays]

Days in the calendar widget (seen by clicking on time in Deskbar) are not vertically aligned. This can be easily seen if a day is selected (see attached image). Same goes for date selection in "Date and time", where system datetime is modified.

[accessays]

This is due to incorrect centering calculations in CalendarView. Now it is done as follows:

float offsetV = frame.Height() / 2.0 + FontHeight(owner) / 2.0 - 2.0;
...
DrawString(..., BPoint(..., frame.top + offsetV));

where FontHeight(owner) is ascent + descent + leading, and - 2.0 accounts for the extra padding (4.0) within the cell, I assume.

The correct calculation is as follows:

font_height fheight;
font.GetHeight(&fheight);
float offsetV = (frame.Height() - (fheight.ascent + fheight.descent + fheight.leading)) + fheight.ascent - 2.0;

This centers the text like you would center a bitmap (top + (bounds.height - bitmap.height)/2) and accounts for the fact that font rendering is done from the baseline (+ fheight.ascent).

This makes the result better, but does not fully fix the issue. The numbers in the cells start drifting the lower down they are. I'm guessing that's because cell borders are not taken into account, but I haven't looked at that yet.

[accessays]

Looks a lot better on the first row

[accessays]

But still offset on the bottom row