|
 |
f325b2 |
From 8891a0194cf213d05dd5bc96d24c20f5b224ca4f Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Thu, 19 Nov 2015 14:57:38 +0100
|
|
|
f325b2 |
Subject: [PATCH 346/398] sw lok comments: don't paint hidden comment
|
|
|
f325b2 |
sub-widgets
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ia513821b43729951c7b097fea498f0e22b9d10ea
|
|
|
f325b2 |
(cherry picked from commit 8a1b9ac592c026de6c764277a6ad1f8db9a4a679)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sw/source/uibase/docvw/SidebarWin.cxx | 8 +++-----
|
|
|
f325b2 |
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
f325b2 |
index 9d12a12eae35..5f6cfa7c4ae0 100644
|
|
|
f325b2 |
--- a/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
f325b2 |
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
f325b2 |
@@ -276,15 +276,13 @@ void SwSidebarWin::PaintTile(vcl::RenderContext& rRenderContext, const Rectangle
|
|
|
f325b2 |
{
|
|
|
f325b2 |
vcl::Window* pChild = GetChild(i);
|
|
|
f325b2 |
|
|
|
f325b2 |
- // This would at the moment just draw a gray rectangle at the top right
|
|
|
f325b2 |
- // corner, need to sort out later.
|
|
|
f325b2 |
- if (pChild == mpVScrollbar.get())
|
|
|
f325b2 |
- continue;
|
|
|
f325b2 |
-
|
|
|
f325b2 |
// No point in showing this button till click on it are not handled.
|
|
|
f325b2 |
if (pChild == mpMenuButton.get())
|
|
|
f325b2 |
continue;
|
|
|
f325b2 |
|
|
|
f325b2 |
+ if (!pChild->IsVisible())
|
|
|
f325b2 |
+ continue;
|
|
|
f325b2 |
+
|
|
|
f325b2 |
rRenderContext.Push(PushFlags::MAPMODE);
|
|
|
f325b2 |
const Fraction& rFraction(mrView.GetWrtShellPtr()->GetOut()->GetMapMode().GetScaleY());
|
|
|
f325b2 |
Point aOffset(PixelToLogic(pChild->GetPosPixel() * rFraction.GetDenominator() / rFraction.GetNumerator()));
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|