AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve command events as is.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2676 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-06-23 20:16:07 +00:00
parent 25ebfba64f
commit b8b76e091c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/miso/client/MisoScenePanel.java
+10 -5
View File
@@ -1,5 +1,5 @@
// //
// $Id: MisoScenePanel.java,v 1.46 2003/06/20 21:50:56 mdb Exp $ // $Id: MisoScenePanel.java,v 1.47 2003/06/23 20:16:07 mdb Exp $
package com.threerings.miso.client; package com.threerings.miso.client;
@@ -36,6 +36,7 @@ import java.util.List;
import com.samskivert.swing.Controller; import com.samskivert.swing.Controller;
import com.samskivert.swing.RadialMenu; import com.samskivert.swing.RadialMenu;
import com.samskivert.swing.event.CommandEvent;
import com.samskivert.util.HashIntMap; import com.samskivert.util.HashIntMap;
import com.samskivert.util.RuntimeAdjust; import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
@@ -398,10 +399,14 @@ public class MisoScenePanel extends VirtualMediaPanel
_activeMenu = menu; _activeMenu = menu;
_activeMenu.addActionListener(new ActionListener() { _activeMenu.addActionListener(new ActionListener() {
public void actionPerformed (ActionEvent e) { public void actionPerformed (ActionEvent e) {
SceneObjectActionEvent event = new SceneObjectActionEvent( if (e instanceof CommandEvent) {
e.getSource(), e.getID(), e.getActionCommand(), fireObjectAction(handler, scobj, e);
e.getModifiers(), scobj); } else {
fireObjectAction(handler, scobj, event); SceneObjectActionEvent event = new SceneObjectActionEvent(
e.getSource(), e.getID(), e.getActionCommand(),
e.getModifiers(), scobj);
fireObjectAction(handler, scobj, event);
}
} }
}); });
_activeMenu.activate(this, mbounds, scobj); _activeMenu.activate(this, mbounds, scobj);