From ce3e760f9155ac8d80f60054be036e862df7029a Mon Sep 17 00:00:00 2001 From: Andreas Heinisch Date: Thu, 17 Mar 2022 21:14:10 +0100 Subject: tdf#111924 - Special characters: don't lose focus on context menu Don't lose focus on the favorite or recently used items in the special characters dialog when right-clicking them to show the context menu. Change-Id: Iaedc4bbc6fb627591b9c0cd9a2c44940312eeb1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131721 Tested-by: Andreas Heinisch Reviewed-by: Andreas Heinisch --- sfx2/source/control/charwin.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sfx2') diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx index eb5b5662a817..6b7c8cd8b514 100644 --- a/sfx2/source/control/charwin.cxx +++ b/sfx2/source/control/charwin.cxx @@ -189,7 +189,8 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang aPoint.setX(-aBoundRect.Left() + (aSize.Width() - aBoundRect.GetWidth()) / 2); } - if (HasFocus()) + // tdf#111924 - don't lose focus on context menu + if (HasFocus() || HasChildFocus()) { rRenderContext.SetFillColor(aHighlightColor); rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), aSize)); -- cgit