The following commit has been merged in the master branch: commit 6a6ac5dd9f5256749b84202b790e9944b78e582d Author: Felix Natter <fnat...@gmx.net> Date: Tue Apr 2 19:58:35 2013 +0200
Imported Upstream version 1.2.23 diff --git a/freeplane/doc/history_en.txt b/freeplane/doc/history_en.txt index 3d3c596..6cdd4fc 100644 --- a/freeplane/doc/history_en.txt +++ b/freeplane/doc/history_en.txt @@ -1,4 +1,8 @@ =============================== +1.2.23 +=============================== +Bug fix for dragging of nodes when node tool tip is shown +=============================== 1.2.22 =============================== Bug fixes for script based conditions for filters and conditional styles diff --git a/freeplane/src/org/freeplane/view/swing/map/NodeTooltipManager.java b/freeplane/src/org/freeplane/view/swing/map/NodeTooltipManager.java index 6aa73f3..e8255db 100644 --- a/freeplane/src/org/freeplane/view/swing/map/NodeTooltipManager.java +++ b/freeplane/src/org/freeplane/view/swing/map/NodeTooltipManager.java @@ -22,6 +22,7 @@ import javax.swing.JToolTip; import javax.swing.PopupFactory; import javax.swing.SwingUtilities; import javax.swing.Timer; +import javax.swing.UIManager; import org.freeplane.core.extension.IExtension; import org.freeplane.core.resources.IFreeplanePropertyListener; @@ -67,6 +68,7 @@ public class NodeTooltipManager implements IExtension{ "toolTipManager.max_tooltip_width", Integer.MAX_VALUE); NodeTooltip.setMaximumWidth(maxWidth); setTooltipDelays(instance); + UIManager.put("PopupMenu.consumeEventOnClose", Boolean.FALSE); ResourceController.getResourceController().addPropertyChangeListener(new IFreeplanePropertyListener() { public void propertyChanged(final String propertyName, final String newValue, final String oldValue) { if (propertyName.startsWith(TOOL_TIP_MANAGER)) { @@ -165,14 +167,7 @@ public class NodeTooltipManager implements IExtension{ }); tip.setTipText(toolTipText); - PopupFactory popupFactory = PopupFactory.getSharedInstance(); - final JComponent nearComponent; -// if (insideComponent instanceof MainView) { -// nearComponent = ((MainView)insideComponent).getNodeView().getContent(); -// } -// else{ - nearComponent = insideComponent; -// } + final JComponent nearComponent = insideComponent; focusOwnerRef = new WeakReference<Component>(KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner()); tipPopup = new JPopupMenu(); tipPopup.setLayout(new GridLayout(1, 1)); diff --git a/freeplane/viewer-resources/version.properties b/freeplane/viewer-resources/version.properties index e6bb5a9..50083e7 100644 --- a/freeplane/viewer-resources/version.properties +++ b/freeplane/viewer-resources/version.properties @@ -1,2 +1,2 @@ -freeplane_version=1.2.22 +freeplane_version=1.2.23 freeplane_version_status= diff --git a/freeplane_framework/windows-installer/Freeplane_without_Java.iss b/freeplane_framework/windows-installer/Freeplane_without_Java.iss index 88e634a..6714b42 100644 --- a/freeplane_framework/windows-installer/Freeplane_without_Java.iss +++ b/freeplane_framework/windows-installer/Freeplane_without_Java.iss @@ -11,7 +11,7 @@ ; Predrag Cuklin 18/06/2009 - Universial Version ;**************************************************************************** -#define MyVersion "1.2.22" +#define MyVersion "1.2.23" #define MyAppName "Freeplane" #define MyAppPublisher "Open source" #define MyAppURL "http://sourceforge.net/projects/freeplane/" diff --git a/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini b/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini index b8bb938..abddfd6 100644 --- a/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini +++ b/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini @@ -21,8 +21,8 @@ CommercialUse=true EULAVersion=1 [Version] -PackageVersion=1.2.22.1 -DisplayVersion=1.2.22 +PackageVersion=1.2.23.1 +DisplayVersion=1.2.23 [SpecialPaths] Plugins=NONE -- freeplane packaging _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits