Date: Wed, 22 Nov 2017 00:07:31 +0000 (UTC) From: Barbara Guida <bar@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454659 - in head/net-p2p/amule-devel: . files Message-ID: <201711220007.vAM07Vtp053971@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bar Date: Wed Nov 22 00:07:30 2017 New Revision: 454659 URL: https://svnweb.freebsd.org/changeset/ports/454659 Log: Add two patches to fix switching tab on search. Added: head/net-p2p/amule-devel/files/patch-src_MuleNotebook.cpp (contents, props changed) head/net-p2p/amule-devel/files/patch-src_MuleNotebook.h (contents, props changed) Modified: head/net-p2p/amule-devel/Makefile Modified: head/net-p2p/amule-devel/Makefile ============================================================================== --- head/net-p2p/amule-devel/Makefile Tue Nov 21 22:43:06 2017 (r454658) +++ head/net-p2p/amule-devel/Makefile Wed Nov 22 00:07:30 2017 (r454659) @@ -3,7 +3,7 @@ PORTNAME= amule PORTVERSION= 10990 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel Added: head/net-p2p/amule-devel/files/patch-src_MuleNotebook.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/amule-devel/files/patch-src_MuleNotebook.cpp Wed Nov 22 00:07:30 2017 (r454659) @@ -0,0 +1,43 @@ +--- src/MuleNotebook.cpp.orig 2017-06-03 23:55:41.000000000 +0200 ++++ src/MuleNotebook.cpp 2017-11-20 14:51:19.834947000 +0100 +@@ -45,10 +45,10 @@ + EVT_MENU(MP_CLOSE_OTHER_TABS, CMuleNotebook::OnPopupCloseOthers) + + // Madcat - tab closing engine +- EVT_LEFT_DOWN(CMuleNotebook::OnMouseButtonRelease) +- EVT_LEFT_UP(CMuleNotebook::OnMouseButtonRelease) +- EVT_MIDDLE_DOWN(CMuleNotebook::OnMouseButtonRelease) +- EVT_MIDDLE_UP(CMuleNotebook::OnMouseButtonRelease) ++ EVT_LEFT_DOWN(CMuleNotebook::OnMouseButton) ++ EVT_LEFT_UP(CMuleNotebook::OnMouseButton) ++ EVT_MIDDLE_DOWN(CMuleNotebook::OnMouseButton) ++ EVT_MIDDLE_UP(CMuleNotebook::OnMouseButton) + EVT_MOTION(CMuleNotebook::OnMouseMotion) + #if MULE_NEEDS_DELETEPAGE_WORKAROUND + EVT_MULENOTEBOOK_DELETE_PAGE(wxID_ANY, CMuleNotebook::OnDeletePage) +@@ -217,7 +217,7 @@ + } + + +-void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event) ++void CMuleNotebook::OnMouseButton(wxMouseEvent &event) + { + if (GetImageList() == NULL) { + // This Mulenotebook has no images on tabs, so nothing to do. +@@ -235,16 +235,13 @@ + + if (event.LeftDown() && (flags == wxNB_HITTEST_ONICON)) { + tab_down_icon = tab; +- return; + } + else if (event.MiddleDown() && (flags == wxNB_HITTEST_ONLABEL)) { + tab_down_label = tab; +- return; + } + else if (event.LeftDown() || event.MiddleDown()) { + tab_down_icon = -1; + tab_down_label = -1; +- return; + } + + if (((tab != -1) && (((flags == wxNB_HITTEST_ONICON) && event.LeftUp() && (tab == tab_down_icon)) || Added: head/net-p2p/amule-devel/files/patch-src_MuleNotebook.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/amule-devel/files/patch-src_MuleNotebook.h Wed Nov 22 00:07:30 2017 (r454659) @@ -0,0 +1,14 @@ +--- src/MuleNotebook.h.orig 2017-06-03 23:55:41.000000000 +0200 ++++ src/MuleNotebook.h 2017-11-20 14:52:35.287092000 +0100 +@@ -130,9 +130,9 @@ + + protected: + /** +- * Event handler for left or middle mouse button release (for closing pages) ++ * Event handler for left or middle mouse button to press or release (for closing pages) + */ +- void OnMouseButtonRelease(wxMouseEvent &event); ++ void OnMouseButton(wxMouseEvent &event); + + /** + * Event handler for mouse motion (for highlighting the 'x')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711220007.vAM07Vtp053971>