From 4305d9a4b97a660fec54d2796f7e5cb502d4fba0 Mon Sep 17 00:00:00 2001 From: Ashod Nakashian Date: Mon, 7 Jan 2019 07:29:03 -0500 Subject: Revert "lok: custom widgets: render editbox borders" Looks like this is no longer needed to correctly render editbox borders. Not clear what fixed the issue. This reverts commit 7484f1691cbe9513dabf084effe8a0366b737a80. Change-Id: Ieb3b8d6f60ab762d0baccb341ed6a39ae2771e79 Reviewed-on: https://gerrit.libreoffice.org/66774 Tested-by: Jenkins Reviewed-by: Jan Holesovsky --- vcl/source/control/edit.cxx | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 12b9b8943d8e..f15daa864ede 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -55,7 +55,6 @@ #include #include -#include #include #include @@ -987,7 +986,7 @@ void Edit::ImplClearBackground(vcl::RenderContext& rRenderContext, const tools:: } } -void Edit::ImplPaintBorder(vcl::RenderContext& rRenderContext) +void Edit::ImplPaintBorder(vcl::RenderContext const & rRenderContext) { // this is not needed when double-buffering if (SupportsDoubleBuffering()) @@ -1044,17 +1043,7 @@ void Edit::ImplPaintBorder(vcl::RenderContext& rRenderContext) } else { - // For some mysterious reason, in headless/svp rendering, - // pBorder has bad clipping region (shows as 1x1@0,0), - // and therefore doesn't render anything at all. - // In the case that we know we're in headless/svp, we - // render directly on the current context (the edit control). - // But if we (the editbox) are part of a more complex control - // (e.g. spinbox), we render not (i.e. we let pBorder pretend). - if (!mbIsSubEdit && comphelper::LibreOfficeKit::isActive()) - pBorder->Paint(rRenderContext, tools::Rectangle()); - else - pBorder->Paint(*pBorder, tools::Rectangle()); + pBorder->Paint(*pBorder, tools::Rectangle()); } } } -- cgit