[Libreoffice-commits] core.git: 2 commits - basctl/source svx/source

[Andreas Heinisch (via logerrit)]

 basctl/source/basicide/linenumberwindow.cxx |    8 +++++++-
 svx/source/dialog/searchcharmap.cxx         |   13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 9da3d052b9048e9139b6943621f4eb6777422078
Author:     Andreas Heinisch <andreas.heini...@yahoo.de>
AuthorDate: Mon Feb 27 19:11:59 2023 +0100
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Feb 28 07:15:19 2023 +0000

    tdf#109214 - Highlight the favorites in the grid of special characters
    
    Change-Id: I3b19aa833be4c7b9b0499ad051a240f131eba7ca
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147926
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/svx/source/dialog/searchcharmap.cxx 
b/svx/source/dialog/searchcharmap.cxx
index 034ebd317a5a..637fbbe0d834 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -230,6 +230,19 @@ void SvxSearchCharSet::DrawChars_Impl(vcl::RenderContext& 
rRenderContext, int n1
                 aPointTxTy.AdjustX(nXHDelta - 1 );
         }
 
+        // tdf#109214 - highlight the favorite characters
+        if (isFavChar(aCharStr, mxVirDev->GetFont().GetFamilyName()))
+        {
+            const Color aLineCol = rRenderContext.GetLineColor();
+            rRenderContext.SetLineColor(aHighlightColor);
+            rRenderContext.SetFillColor(COL_TRANSPARENT);
+            // Outer border
+            rRenderContext.DrawRect(tools::Rectangle(Point(x - 1, y - 1), 
Size(nX + 3, nY + 3)));
+            // Inner border
+            rRenderContext.DrawRect(tools::Rectangle(Point(x, y), Size(nX + 1, 
nY + 1)));
+            rRenderContext.SetLineColor(aLineCol);
+        }
+
         Color aTextCol = rRenderContext.GetTextColor();
         if (i != nSelectedIndex)
         {
commit dbd96e1c9a066979cb80ced6268edb148a8fc73b
Author:     Andreas Heinisch <andreas.heini...@yahoo.de>
AuthorDate: Mon Feb 27 13:49:10 2023 +0100
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Feb 28 07:15:07 2023 +0000

    tdf#153798 - Basic IDE: align line numbers to the right
    
    Change-Id: I6a8335b51aa7d4b50577aeefb188e3d81ddfee03
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147892
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/basctl/source/basicide/linenumberwindow.cxx 
b/basctl/source/basicide/linenumberwindow.cxx
index 74ead4923863..9f5e85c72102 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -79,7 +79,13 @@ void LineNumberWindow::Paint(vcl::RenderContext& 
rRenderContext, const tools::Re
     sal_Int64 y = (nStartLine - 1) * static_cast<sal_Int64>(nLineHeight);
     rRenderContext.SetTextColor(m_FontColor);
     for (sal_uInt32 n = nStartLine; n <= nEndLine; ++n, y += nLineHeight)
-        rRenderContext.DrawText(Point(0, y - m_nCurYOffset), 
OUString::number(n));
+    {
+        const OUString aLineNumber = OUString::number(n);
+        // tdf#153798 - align line numbers to the right
+        rRenderContext.DrawText(
+            Point(m_nWidth - GetTextWidth(aLineNumber) - m_nBaseWidth / 2, y - 
m_nCurYOffset),
+            aLineNumber);
+    }
 
     // Resize the parent after calculating the new width and height values
     GetParent()->Resize();