From 08a28d9ca768775842de65db463027fc233191d6 Mon Sep 17 00:00:00 2001 From: Gyedo Jeon Date: Mon, 29 Mar 2010 23:48:17 +0000 Subject: [PATCH] Made arrow key events passed from wx to panda --- direct/src/leveleditor/LevelEditorUIBase.py | 24 +++++++++++++++++++++ direct/src/leveleditor/ViewPort.py | 6 +++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/direct/src/leveleditor/LevelEditorUIBase.py b/direct/src/leveleditor/LevelEditorUIBase.py index d236748985..75bd8e9b94 100755 --- a/direct/src/leveleditor/LevelEditorUIBase.py +++ b/direct/src/leveleditor/LevelEditorUIBase.py @@ -338,6 +338,18 @@ class LevelEditorUIBase(WxAppShell): base.direct.fControl = 1 elif evt.GetKeyCode() == wx.WXK_SHIFT: base.direct.fShift = 1 + elif evt.GetKeyCode() == wx.WXK_UP: + messenger.send('arrow_up') + elif evt.GetKeyCode() == wx.WXK_DOWN: + messenger.send('arrow_down') + elif evt.GetKeyCode() == wx.WXK_LEFT: + messenger.send('arrow_left') + elif evt.GetKeyCode() == wx.WXK_RIGHT: + messenger.send('arrow_right') + elif evt.GetKeyCode() == wx.WXK_PAGEUP: + messenger.send('page_up') + elif evt.GetKeyCode() == wx.WXK_PAGEDOWN: + messenger.send('page_down') else: evt.Skip() @@ -348,6 +360,18 @@ class LevelEditorUIBase(WxAppShell): base.direct.fControl = 0 elif evt.GetKeyCode() == wx.WXK_SHIFT: base.direct.fShift = 0 + elif evt.GetKeyCode() == wx.WXK_UP: + messenger.send('arrow_up-up') + elif evt.GetKeyCode() == wx.WXK_DOWN: + messenger.send('arrow_down-up') + elif evt.GetKeyCode() == wx.WXK_LEFT: + messenger.send('arrow_left-up') + elif evt.GetKeyCode() == wx.WXK_RIGHT: + messenger.send('arrow_right-up') + elif evt.GetKeyCode() == wx.WXK_PAGEUP: + messenger.send('page_up-up') + elif evt.GetKeyCode() == wx.WXK_PAGEDOWN: + messenger.send('page_down-up') else: evt.Skip() diff --git a/direct/src/leveleditor/ViewPort.py b/direct/src/leveleditor/ViewPort.py index cd4a7fde2d..a342ad31e0 100755 --- a/direct/src/leveleditor/ViewPort.py +++ b/direct/src/leveleditor/ViewPort.py @@ -95,9 +95,9 @@ class Viewport(wx.Panel, DirectObject): self.camNode.setCameraMask(LE_CAM_MASKS[self.name]) - bt = base.setupMouse(self.win, True) - bt.node().setPrefix('_le_%s_'%self.name[:3]) - mw = bt.getParent() + self.bt = base.setupMouse(self.win, True) + self.bt.node().setPrefix('_le_%s_'%self.name[:3]) + mw = self.bt.getParent() mk = mw.getParent() winCtrl = WindowControls( self.win, mouseWatcher=mw,