From 4a902e0c59b0dd01e6459c226268bdee4f15489a Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Wed, 14 May 2014 16:06:42 +0300 Subject: Revert "startcenter: react on mouse down instead" This reverts commit 1a2a961c1e7cdef648c28e211433e8de6e8a831b. As suggested by Kendy, opening with a single click by mouse up is more natural. We need to find a better solution for the bug mentioned in the above commit. --- sfx2/source/control/recentdocsview.cxx | 16 ++++++++++++---- sfx2/source/control/recentdocsviewitem.cxx | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'sfx2') 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()) { -- cgit