diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2014-05-05 22:00:09 +0300 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2014-05-05 22:22:39 +0300 |
commit | 1a2a961c1e7cdef648c28e211433e8de6e8a831b (patch) | |
tree | 02d443df58c21354baaf1657f329f480273023c4 | |
parent | 25195658ab405cfc288950e15529e97ceb72575d (diff) |
startcenter: react on mouse down instead
There is a good reason for that: File lists of
some file pickers handle double click event on
mouse down. So if a start center thumbnail is
exactly behind the file on which the user double-
clicked, it will receive the mouse up event, and
will also open.
Change-Id: I9fc9ceff0874d0486d5b568c9b35143c8d8aabf8
-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, 7 insertions, 17 deletions
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index c1ba062a7fee..0ebf30ed4145 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -63,8 +63,6 @@ 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 b1a51fefaa6b..71b647488010 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 MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonDown(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 ee4fd7fa75aa..cf3e86005ed3 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 MouseButtonUp(const MouseEvent&) {} + virtual void MouseButtonDown(const MouseEvent&) {} protected: diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 0564e8b3e398..b4be9c8247d8 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -213,27 +213,19 @@ void RecentDocsView::MouseButtonDown( const MouseEvent& rMEvt ) { if (rMEvt.IsLeft()) { - // ignore to avoid stuff done in ThumbnailView; we don't do selections etc. - return; - } - - ThumbnailView::MouseButtonDown(rMEvt); -} + if (rMEvt.GetClicks() > 1) + return; -void RecentDocsView::MouseButtonUp(const MouseEvent& rMEvt) -{ - if (rMEvt.IsLeft()) - { size_t nPos = ImplGetItem(rMEvt.GetPosPixel()); ThumbnailViewItem* pItem = ImplGetItem(nPos); if (pItem) { - pItem->MouseButtonUp(rMEvt); + pItem->MouseButtonDown(rMEvt); return; } } - ThumbnailView::MouseButtonUp(rMEvt); + ThumbnailView::MouseButtonDown(rMEvt); } void RecentDocsView::OnItemDblClicked(ThumbnailViewItem *) diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx index aa2a7e03f320..0dfef15ea6b4 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::MouseButtonUp(const MouseEvent& rMEvt) +void RecentDocsViewItem::MouseButtonDown(const MouseEvent& rMEvt) { if (rMEvt.IsLeft()) { |