diff options
-rw-r--r-- | include/sfx2/recentdocsview.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/recentdocsviewitem.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/thumbnailviewitem.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/recentdocsview.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/control/recentdocsviewitem.cxx | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 0ebf30ed4145..c1ba062a7fee 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -63,6 +63,8 @@ public: protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx index 71b647488010..b1a51fefaa6b 100644 --- a/include/sfx2/recentdocsviewitem.hxx +++ b/include/sfx2/recentdocsviewitem.hxx @@ -33,7 +33,7 @@ public: virtual void Paint(drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE; - virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; /// Called when the user clicks a document - it will open it. void OpenDocument(); diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index cf3e86005ed3..ee4fd7fa75aa 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -129,7 +129,7 @@ public: static drawinglayer::primitive2d::PolygonHairlinePrimitive2D* createBorderLine (const basegfx::B2DPolygon &rPolygon); - virtual void MouseButtonDown(const MouseEvent&) {} + virtual void MouseButtonUp(const MouseEvent&) {} protected: diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index b4be9c8247d8..0564e8b3e398 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -213,19 +213,27 @@ void RecentDocsView::MouseButtonDown( const MouseEvent& rMEvt ) { if (rMEvt.IsLeft()) { - if (rMEvt.GetClicks() > 1) - return; + // ignore to avoid stuff done in ThumbnailView; we don't do selections etc. + return; + } + + ThumbnailView::MouseButtonDown(rMEvt); +} +void RecentDocsView::MouseButtonUp(const MouseEvent& rMEvt) +{ + if (rMEvt.IsLeft()) + { size_t nPos = ImplGetItem(rMEvt.GetPosPixel()); ThumbnailViewItem* pItem = ImplGetItem(nPos); if (pItem) { - pItem->MouseButtonDown(rMEvt); + pItem->MouseButtonUp(rMEvt); return; } } - ThumbnailView::MouseButtonDown(rMEvt); + ThumbnailView::MouseButtonUp(rMEvt); } void RecentDocsView::OnItemDblClicked(ThumbnailViewItem *) diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx index 0dfef15ea6b4..aa2a7e03f320 100644 --- a/sfx2/source/control/recentdocsviewitem.cxx +++ b/sfx2/source/control/recentdocsviewitem.cxx @@ -182,7 +182,7 @@ void RecentDocsViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProc } } -void RecentDocsViewItem::MouseButtonDown(const MouseEvent& rMEvt) +void RecentDocsViewItem::MouseButtonUp(const MouseEvent& rMEvt) { if (rMEvt.IsLeft()) { |