summaryrefslogtreecommitdiff
authorRafael Dominguez <venccsralph@gmail.com>2012-08-13 02:21:18 (GMT)
committer Rafael Dominguez <venccsralph@gmail.com>2012-08-13 02:44:26 (GMT)
commite51dc25f456db8a2f0130b12ee3d5a90d2fd27a2 (patch) (side-by-side diff)
tree3c92162c2f61c0d23e5c192e8cf488c084c42d25
parent3b709149e605c90eb16743b9b6907294a6cb198e (diff)
downloadcore-e51dc25f456db8a2f0130b12ee3d5a90d2fd27a2.zip
core-e51dc25f456db8a2f0130b12ee3d5a90d2fd27a2.tar.gz
Check correct area when selecting a template by clicking its name.
Change-Id: Idfb4509327c2c9c52f5c736d513d35e3270d91b1
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--sfx2/inc/sfx2/thumbnailviewitem.hxx2
-rw-r--r--sfx2/source/control/thumbnailview.cxx6
-rw-r--r--sfx2/source/control/thumbnailviewitem.cxx8
3 files changed, 5 insertions, 11 deletions
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index cb389b9..3b1aa95 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -106,8 +106,6 @@ public:
void setSelectClickHdl (const Link &link);
- bool isInsideTitle (const Point &pt) const;
-
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs);
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 89946b8..c9b4a13 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -566,7 +566,11 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt )
}
else
{
- if (pItem->isInsideTitle(rMEvt.GetPosPixel()))
+ Rectangle aRect(pItem->getDrawArea());
+ aRect.setY(aRect.getY()+mnItemPadding+mnThumbnailHeight);
+ aRect.SetSize(Size(mnItemWidth,mnDisplayHeight+mnItemPadding));
+
+ if (aRect.IsInside(rMEvt.GetPosPixel()))
{
pItem->setSelection(!pItem->isSelected());
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index dd79548..9db5cbd 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -156,14 +156,6 @@ void ThumbnailViewItem::setSelectClickHdl (const Link &link)
maClickHdl = link;
}
-bool ThumbnailViewItem::isInsideTitle (const Point &pt) const
-{
- Rectangle aRect(Point(maTextPos.X(),mpSelectBox->GetPosPixel().Y()),
- Point(maDrawArea.Right(),maDrawArea.Bottom()));
-
- return aRect.IsInside(pt);
-}
-
void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs)
{