[Nmedit-cvs] nmedit/libs/jtheme/src/net/sf/nmedit/jtheme/component/plaf JTModuleUI.java, 1.18, 1.19

[Christian S. <ch...@us...>]

Update of /cvsroot/nmedit/nmedit/libs/jtheme/src/net/sf/nmedit/jtheme/component/plaf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10632/jtheme/src/net/sf/nmedit/jtheme/component/plaf

Modified Files:
	JTModuleUI.java 
Log Message:
+retarget mouse events and send them to the parent module (broke the transformtool, now fixed)

Index: JTModuleUI.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/jtheme/src/net/sf/nmedit/jtheme/component/plaf/JTModuleUI.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** JTModuleUI.java	5 Feb 2008 18:45:35 -0000	1.18
--- JTModuleUI.java	5 Feb 2008 19:28:23 -0000	1.19
***************
*** 568,572 ****
              enableEvents(MouseEvent.MOUSE_EVENT_MASK|MouseEvent.MOUSE_MOTION_EVENT_MASK);
          }
!         
          public boolean isReducible()
          {
--- 568,572 ----
              enableEvents(MouseEvent.MOUSE_EVENT_MASK|MouseEvent.MOUSE_MOTION_EVENT_MASK);
          }
! 
          public boolean isReducible()
          {
***************
*** 579,605 ****
          }
  */
!         protected void processMouseEvent(MouseEvent e)
          {
!             if ((!e.isConsumed()) && e.getID() == MouseEvent.MOUSE_PRESSED && SwingUtilities.isLeftMouseButton(e))
              {
!             	if (transformPopupMenu != null && transformPopupMenu.getInvoker()==e.getComponent()) {
              		transformPopupMenu.setVisible(false);
              		transformPopupMenu = null;
-             		return;
              	}
!                 Container p = getParent();
!                 if (p instanceof JTModule)
!                 {
!                     PModule m = ((JTModule) p).getModule();
!                     if (m != null)
                      {
!                         createPopup(e, m);
!                         super.processMouseEvent(e);
!                         return;
                      }
!                 }
              }
! 
!             NmSwingUtilities.redispatchMouseEvent(e, getParent());
          }
  
--- 579,617 ----
          }
  */
!         protected void processEvent(AWTEvent e)
          {
!             if (!(e instanceof MouseEvent))
              {
!                 super.processEvent(e);
!                 return;
!             }
!             
!             MouseEvent me = (MouseEvent) e;
!             
!             if ((!me.isConsumed()) && e.getID() == MouseEvent.MOUSE_PRESSED && SwingUtilities.isLeftMouseButton(me))
!             {
!             	if (transformPopupMenu != null && transformPopupMenu.getInvoker()==me.getComponent()) 
!             	{
!             	    // close popup
              		transformPopupMenu.setVisible(false);
              		transformPopupMenu = null;
              	}
!             	else
!             	{
!             	    // show popup
!                     Container p = getParent();
!                     if (p instanceof JTModule)
                      {
!                         PModule m = ((JTModule) p).getModule();
!                         if (m != null)
!                         {
!                             createPopup(me, m);
!                             return;
!                         }
                      }
!             	}
              }
!             
!             super.processEvent(e);
          }