diff options
| -rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/charwin.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/charmap.cxx | 16 | ||||
| -rw-r--r-- | svx/source/dialog/searchcharmap.cxx | 16 |
4 files changed, 24 insertions, 14 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 7effeb4462cf..684186e25a6b 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -1163,10 +1163,12 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang Color aTextCol = rRenderContext.GetTextColor(); Color aFillCol = rRenderContext.GetFillColor(); + Color aLineCol = rRenderContext.GetFillColor(); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); const Color aWindowTextColor(rStyleSettings.GetDialogTextColor()); const Color aWindowColor(rStyleSettings.GetWindowColor()); + const Color aShadowColor(rStyleSettings.GetShadowColor()); rRenderContext.SetTextColor(aWindowTextColor); rRenderContext.SetFillColor(aWindowColor); @@ -1237,10 +1239,12 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang } } + rRenderContext.SetLineColor(aShadowColor); rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), aSize)); rRenderContext.DrawText(aPoint, aText); rRenderContext.SetTextColor(aTextCol); rRenderContext.SetFillColor(aFillCol); + rRenderContext.SetLineColor(aLineCol); if (bShrankFont) rRenderContext.SetFont(aOrigFont); } diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx index 6b7c8cd8b514..567f365e6b32 100644 --- a/sfx2/source/control/charwin.cxx +++ b/sfx2/source/control/charwin.cxx @@ -135,6 +135,7 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor()); Color aFillColor(rStyleSettings.GetWindowColor()); Color aTextColor(rStyleSettings.GetWindowTextColor()); + Color aShadowColor(rStyleSettings.GetShadowColor()); const OUString aText = GetText(); @@ -201,6 +202,7 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang else { rRenderContext.SetFillColor(aFillColor); + rRenderContext.SetLineColor(aShadowColor); rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), aSize)); rRenderContext.SetTextColor(aWindowTextColor); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index a48d26b67954..b268fff518d1 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -510,7 +510,16 @@ void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, Size aOutputSize(GetOutputSizePixel()); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + const Color aWindowTextColor(rStyleSettings.GetFieldTextColor()); + Color aHighlightColor(rStyleSettings.GetHighlightColor()); + Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor()); + Color aFaceColor(rStyleSettings.GetFaceColor()); + Color aLightColor(rStyleSettings.GetLightColor()); + Color aShadowColor(rStyleSettings.GetShadowColor()); + int i; + rRenderContext.SetLineColor(aShadowColor); for (i = 1; i < COLUMN_COUNT; ++i) { rRenderContext.DrawLine(Point(nX * i + m_nXGap, 0), @@ -521,13 +530,6 @@ void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, rRenderContext.DrawLine(Point(0, nY * i + m_nYGap), Point(aOutputSize.Width(), nY * i + m_nYGap)); } - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - const Color aWindowTextColor(rStyleSettings.GetFieldTextColor()); - Color aHighlightColor(rStyleSettings.GetHighlightColor()); - Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor()); - Color aFaceColor(rStyleSettings.GetFaceColor()); - Color aLightColor(rStyleSettings.GetLightColor()); - Color aShadowColor(rStyleSettings.GetShadowColor()); int nTextHeight = rRenderContext.GetTextHeight(); tools::Rectangle aBoundRect; diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx index 201e018d5652..034ebd317a5a 100644 --- a/svx/source/dialog/searchcharmap.cxx +++ b/svx/source/dialog/searchcharmap.cxx @@ -157,7 +157,16 @@ void SvxSearchCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1 Size aOutputSize(GetOutputSizePixel()); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + const Color aWindowTextColor(rStyleSettings.GetFieldTextColor()); + Color aHighlightColor(rStyleSettings.GetHighlightColor()); + Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor()); + Color aFaceColor(rStyleSettings.GetFaceColor()); + Color aLightColor(rStyleSettings.GetLightColor()); + Color aShadowColor(rStyleSettings.GetShadowColor()); + int i; + rRenderContext.SetLineColor(aShadowColor); for (i = 1; i < COLUMN_COUNT; ++i) { rRenderContext.DrawLine(Point(nX * i + m_nXGap, 0), @@ -168,13 +177,6 @@ void SvxSearchCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1 rRenderContext.DrawLine(Point(0, nY * i + m_nYGap), Point(aOutputSize.Width(), nY * i + m_nYGap)); } - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - const Color aWindowTextColor(rStyleSettings.GetFieldTextColor()); - Color aHighlightColor(rStyleSettings.GetHighlightColor()); - Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor()); - Color aFaceColor(rStyleSettings.GetFaceColor()); - Color aLightColor(rStyleSettings.GetLightColor()); - Color aShadowColor(rStyleSettings.GetShadowColor()); int nTextHeight = rRenderContext.GetTextHeight(); tools::Rectangle aBoundRect; |