tdf#140856 macOS listbox rendering
Change-Id: Ib5d4af162da7264d9e6da8742e36c194448bd1fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112132 Tested-by: Jenkins Reviewed-by: Thorsten Wagner <thorsten.wagner.4@gmail.com> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
parent
e3c25c2425
commit
901fee9430
1 changed files with 4 additions and 8 deletions
|
@ -735,10 +735,6 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
|
|||
aTextDrawInfo.kind = kHIThemeFrameListBox;
|
||||
aTextDrawInfo.state = kThemeStateActive;
|
||||
aTextDrawInfo.isFocused = false;
|
||||
rc.size.width += 2 * kThemeMetricListBoxFrameOutset - 2;
|
||||
rc.size.height += 2 * kThemeMetricListBoxFrameOutset - 2;
|
||||
rc.origin.x -= kThemeMetricListBoxFrameOutset - 1;
|
||||
rc.origin.y -= kThemeMetricListBoxFrameOutset - 1;
|
||||
HIThemeDrawFrame(&rc, &aTextDrawInfo, maContextHolder.get(), kHIThemeOrientationNormal);
|
||||
bOK = true;
|
||||
break;
|
||||
|
@ -1046,10 +1042,10 @@ bool AquaSalGraphics::getNativeControlRegion(ControlType nType,
|
|||
}
|
||||
else if (nPart == ControlPart::ListboxWindow)
|
||||
{
|
||||
w = aCtrlBoundRect.GetWidth() - 2 * kThemeMetricListBoxFrameOutset;
|
||||
h = aCtrlBoundRect.GetHeight() - 2 * kThemeMetricListBoxFrameOutset;
|
||||
x += kThemeMetricListBoxFrameOutset;
|
||||
y += kThemeMetricListBoxFrameOutset;
|
||||
w = aCtrlBoundRect.GetWidth() - 2;
|
||||
h = aCtrlBoundRect.GetHeight() - 2;
|
||||
x += 1;
|
||||
y += 1;
|
||||
rNativeBoundingRegion = aCtrlBoundRect;
|
||||
rNativeContentRegion = tools::Rectangle(Point(x, y), Size(w, h));
|
||||
toReturn = true;
|
||||
|
|
Loading…
Reference in a new issue