diff options
author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-10-14 20:06:13 -0400 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2018-11-08 09:14:37 +0100 |
commit | ef70918177d244a4e984f629a5856cca2ec9ac00 (patch) | |
tree | 7aebfebe506a1e9bf9cf4481e7ce8c475dea12fa /vcl | |
parent | e08293b0d3c11f5299aa9236feaafdb7628da10e (diff) |
custom widgets: correct focus colors and render button-up in listboxes
Change-Id: I70f46f94747f468a2bb79f8baa4576e4460bef31
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/headless/CustomWidgetDraw.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vcl/headless/CustomWidgetDraw.cxx b/vcl/headless/CustomWidgetDraw.cxx index 5698f0ac34d8..bdae8cea8ade 100644 --- a/vcl/headless/CustomWidgetDraw.cxx +++ b/vcl/headless/CustomWidgetDraw.cxx @@ -53,9 +53,8 @@ CustomWidgetDraw::~CustomWidgetDraw() {} bool CustomWidgetDraw::isNativeControlSupported(ControlType eType, ControlPart ePart) { - if (!s_pWidgetImplementation) - return false; - return s_pWidgetImplementation->isNativeControlSupported(eType, ePart); + return s_pWidgetImplementation + && s_pWidgetImplementation->isNativeControlSupported(eType, ePart); } bool CustomWidgetDraw::hitTestNativeControl(ControlType /*eType*/, ControlPart /*ePart*/, @@ -302,11 +301,9 @@ bool CustomWidgetDraw::getNativeControlRegion( ControlState eState, const ImplControlValue& /*aValue*/, const OUString& /*aCaption*/, tools::Rectangle& rNativeBoundingRegion, tools::Rectangle& rNativeContentRegion) { - if (!s_pWidgetImplementation) - return false; - - return s_pWidgetImplementation->getRegion(eType, ePart, eState, rBoundingControlRegion, - rNativeBoundingRegion, rNativeContentRegion); + return s_pWidgetImplementation + && s_pWidgetImplementation->getRegion(eType, ePart, eState, rBoundingControlRegion, + rNativeBoundingRegion, rNativeContentRegion); } bool CustomWidgetDraw::updateSettings(AllSettings& rSettings) |