]> gerrit.simantics Code Review - simantics/platform.git/blobdiff - bundles/org.simantics.diagram/src/org/simantics/diagram/ui/e4/SWTPopupMenuParticipant.java
Small but effective HiDPI fixes for platform G2D
[simantics/platform.git] / bundles / org.simantics.diagram / src / org / simantics / diagram / ui / e4 / SWTPopupMenuParticipant.java
index 1aaaed9455238e426a7734b45bc6c365d0ba637a..e6e4d33ee1e98639ee64e063fd557db368209b5e 100644 (file)
-/*******************************************************************************\r
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management\r
- * in Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.diagram.ui.e4;\r
-\r
-import java.awt.geom.Point2D;\r
-\r
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;\r
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;\r
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;\r
-import org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu;\r
-import org.eclipse.jface.action.GroupMarker;\r
-import org.eclipse.jface.action.IMenuListener2;\r
-import org.eclipse.jface.action.IMenuManager;\r
-import org.eclipse.jface.action.MenuManager;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.events.MenuAdapter;\r
-import org.eclipse.swt.events.MenuEvent;\r
-import org.eclipse.swt.events.MenuListener;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Display;\r
-import org.eclipse.swt.widgets.Event;\r
-import org.eclipse.swt.widgets.Listener;\r
-import org.eclipse.swt.widgets.Menu;\r
-import org.eclipse.ui.IWorkbenchActionConstants;\r
-import org.eclipse.ui.IWorkbenchPartSite;\r
-import org.simantics.diagram.ui.WorkbenchSelectionProvider;\r
-import org.simantics.g2d.canvas.ICanvasContext;\r
-import org.simantics.g2d.canvas.impl.AbstractCanvasParticipant;\r
-import org.simantics.g2d.canvas.impl.DependencyReflection.Dependency;\r
-import org.simantics.g2d.diagram.DiagramHints;\r
-import org.simantics.g2d.participant.TransformUtil;\r
-import org.simantics.scenegraph.g2d.events.EventHandlerReflection.EventHandler;\r
-import org.simantics.scenegraph.g2d.events.command.CommandEvent;\r
-import org.simantics.scenegraph.g2d.events.command.ShowPopup;\r
-import org.simantics.utils.datastructures.hints.HintListenerAdapter;\r
-import org.simantics.utils.datastructures.hints.IHintContext.Key;\r
-import org.simantics.utils.datastructures.hints.IHintListener;\r
-import org.simantics.utils.datastructures.hints.IHintObservable;\r
-\r
-/**\r
- * A participant that initializes an SWT pop-up menu and registers it with the\r
- * Eclipse workbench if a workbench site is provided. The client can specify the\r
- * ID of the menu to create which allows the user to control contributions via\r
- * Eclipse's declarative command mechanisms.\r
- * \r
- * @author Tuukka Lehtonen\r
- */\r
-public class SWTPopupMenuParticipant extends AbstractCanvasParticipant {\r
-\r
-    @Dependency\r
-    WorkbenchSelectionProvider wbsp;\r
-    @Dependency\r
-    TransformUtil              trUtil;\r
-\r
-    MPart                      part;\r
-    Control                    control;\r
-    Display                    display;\r
-    MenuManager                menuManager;\r
-    String                     menuId;\r
-\r
-    IHintListener popupListener = new HintListenerAdapter() {\r
-        @Override\r
-        public void hintChanged(IHintObservable sender, Key key, Object oldValue, Object newValue) {\r
-            if (key == DiagramHints.SHOW_POPUP_MENU) {\r
-                if (newValue != null) {\r
-                    Control c = control;\r
-                    if (display.isDisposed() || c == null || c.isDisposed())\r
-                        return;\r
-\r
-                    showPopup((Point2D) newValue);\r
-                }\r
-            }\r
-        }\r
-    };\r
-\r
-    IMenuListener2 menuManagerListener = new IMenuListener2() {\r
-        @Override\r
-        public void menuAboutToShow(IMenuManager manager) {\r
-            manager.add(new GroupMarker(IWorkbenchActionConstants.WB_START));\r
-//            manager.add(new GroupMarker(IWorkbenchActionConstants.NEW_EXT));\r
-//            manager.add(new GroupMarker(IWorkbenchActionConstants.IMPORT_EXT));\r
-//            manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));\r
-//            manager.add(new GroupMarker(IWorkbenchActionConstants.WB_END));\r
-        }\r
-        @Override\r
-        public void menuAboutToHide(IMenuManager manager) {\r
-        }\r
-    };\r
-\r
-    MenuListener menuListener = new MenuAdapter() {\r
-        @Override\r
-        public void menuShown(MenuEvent e) {\r
-            asyncExec(new Runnable() {\r
-                @Override\r
-                public void run() {\r
-                    final long time = System.currentTimeMillis();\r
-                    //System.out.println("popup shown: " + time);\r
-                    setHint(DiagramHints.POPUP_MENU_SHOWN, time);\r
-                    removeHint(DiagramHints.POPUP_MENU_HIDDEN);\r
-                }\r
-            });\r
-        }\r
-        @Override\r
-        public void menuHidden(MenuEvent e) {\r
-            asyncExec(new Runnable() {\r
-                @Override\r
-                public void run() {\r
-                    final long time = System.currentTimeMillis();\r
-                    //System.out.println("popup closed: " + time);\r
-                    removeHint(DiagramHints.POPUP_MENU_SHOWN);\r
-                    setHint(DiagramHints.POPUP_MENU_HIDDEN, time);\r
-                }\r
-            });\r
-        }\r
-    };\r
-\r
-    /**\r
-     * NOTE: this constructor must currently be invoked from the SWT display\r
-     * thread.\r
-     * \r
-     * @param site\r
-     * @param control\r
-     * @param menuId\r
-     * @deprecated use {@link #SWTPopupMenuParticipant(IWorkbenchPartSite, Control, Display, String)} instead\r
-     */\r
-    public SWTPopupMenuParticipant(MPart part, Control control, String menuId) {\r
-        this(part, control, control.getDisplay(), menuId);\r
-    }\r
-\r
-    public SWTPopupMenuParticipant(MPart part, Control control, Display display, String menuId) {\r
-        super();\r
-        this.part = part;\r
-        this.control = control;\r
-        this.display = display;\r
-        this.menuId = menuId;\r
-        control.addListener(SWT.Dispose, new Listener() {\r
-\r
-            @Override\r
-            public void handleEvent(Event event) {\r
-                SWTPopupMenuParticipant.this.control = null;\r
-                if(menuManager != null) {\r
-                    menuManager.removeAll();\r
-                    menuManager.dispose();\r
-                    menuManager = null;\r
-                }\r
-            }\r
-            \r
-        });\r
-    }\r
-\r
-    @Override\r
-    public void addedToContext(ICanvasContext ctx) {\r
-        super.addedToContext(ctx);\r
-\r
-        display.asyncExec(new Runnable() {\r
-            @Override\r
-            public void run() {\r
-                if (control == null || control.isDisposed())\r
-                    return;\r
-                menuManager = createPopupMenu();\r
-                if (menuManager != null) {\r
-                    Menu menu = menuManager.createContextMenu(control);\r
-                    menu.addMenuListener(menuListener);\r
-                    control.setMenu(menu);\r
-                    if (part != null) {\r
-                        // #TODO Finish this when we are going to use full E4 workbench\r
-//                        site.registerContextMenu(menuManager.getId(), menuManager, wbsp);\r
-                    }\r
-                }\r
-            }\r
-        });\r
-\r
-        getHintStack().addKeyHintListener(DiagramHints.SHOW_POPUP_MENU, popupListener);\r
-    }\r
-\r
-    @Override\r
-    public void removedFromContext(ICanvasContext ctx) {\r
-        getHintStack().removeKeyHintListener(DiagramHints.SHOW_POPUP_MENU, popupListener);\r
-        super.removedFromContext(ctx);\r
-    }\r
-\r
-    protected MenuManager createPopupMenu() {\r
-        // #TODO Finish this when we are going to use full E4 workbench\r
-//        MPopupMenu popupMenu = MMenuFactory.INSTANCE.createPopupMenu();\r
-//        popupMenu.setLabel("Canvas Popup");\r
-//        popupMenu.setElementId(menuId);\r
-//        popupMenu.l\r
-        \r
-        final MenuManager mm = new MenuManager("Canvas Popup", menuId);\r
-        mm.setRemoveAllWhenShown(true);\r
-        mm.addMenuListener(menuManagerListener);\r
-        return mm;\r
-    }\r
-\r
-    @EventHandler(priority = 0)\r
-    public boolean handleCommands(CommandEvent e) {\r
-        if (e.command instanceof ShowPopup) {\r
-            showPopup(((ShowPopup) e.command).getControlPosition());\r
-            return true;\r
-        }\r
-        return false;\r
-    }\r
-\r
-    /**\r
-     * @param newValue\r
-     * @thread canvas-thread (AWT)\r
-     */\r
-    protected void showPopup(Point2D newValue) {\r
-        final Point2D cp = (Point2D) newValue;\r
-        setHint(DiagramHints.POPUP_MENU_CONTROL_POSITION, cp);\r
-        setHint(DiagramHints.POPUP_MENU_CANVAS_POSITION, trUtil.controlToCanvas(cp, null));\r
-        display.asyncExec(new Runnable() {\r
-            @Override\r
-            public void run() {\r
-                if (control == null || control.isDisposed())\r
-                    return;\r
-                Point p = control.toDisplay((int) cp.getX(), (int) cp.getY());\r
-                menuManager.getMenu().setLocation(p);\r
-                menuManager.getMenu().setVisible(true);\r
-            }\r
-        });\r
-    }\r
-\r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.diagram.ui.e4;
+
+import java.awt.geom.Point2D;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.jface.action.GroupMarker;
+import org.eclipse.jface.action.IMenuListener2;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MenuAdapter;
+import org.eclipse.swt.events.MenuEvent;
+import org.eclipse.swt.events.MenuListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.simantics.diagram.ui.WorkbenchSelectionProvider;
+import org.simantics.g2d.canvas.ICanvasContext;
+import org.simantics.g2d.canvas.impl.AbstractCanvasParticipant;
+import org.simantics.g2d.canvas.impl.DependencyReflection.Dependency;
+import org.simantics.g2d.diagram.DiagramHints;
+import org.simantics.g2d.participant.TransformUtil;
+import org.simantics.scenegraph.g2d.events.EventHandlerReflection.EventHandler;
+import org.simantics.scenegraph.g2d.events.command.CommandEvent;
+import org.simantics.scenegraph.g2d.events.command.ShowPopup;
+import org.simantics.utils.datastructures.hints.HintListenerAdapter;
+import org.simantics.utils.datastructures.hints.IHintContext.Key;
+import org.simantics.utils.datastructures.hints.IHintListener;
+import org.simantics.utils.datastructures.hints.IHintObservable;
+import org.simantics.utils.ui.SWTDPIUtil;
+
+/**
+ * A participant that initializes an SWT pop-up menu and registers it with the
+ * Eclipse workbench if a workbench site is provided. The client can specify the
+ * ID of the menu to create which allows the user to control contributions via
+ * Eclipse's declarative command mechanisms.
+ * 
+ * @author Tuukka Lehtonen
+ */
+public class SWTPopupMenuParticipant extends AbstractCanvasParticipant {
+
+    @Dependency
+    WorkbenchSelectionProvider wbsp;
+    @Dependency
+    TransformUtil              trUtil;
+
+    MPart                      part;
+    Control                    control;
+    Display                    display;
+    MenuManager                menuManager;
+    String                     menuId;
+
+    IHintListener popupListener = new HintListenerAdapter() {
+        @Override
+        public void hintChanged(IHintObservable sender, Key key, Object oldValue, Object newValue) {
+            if (key == DiagramHints.SHOW_POPUP_MENU) {
+                if (newValue != null) {
+                    Control c = control;
+                    if (display.isDisposed() || c == null || c.isDisposed())
+                        return;
+
+                    showPopup((Point2D) newValue);
+                }
+            }
+        }
+    };
+
+    IMenuListener2 menuManagerListener = new IMenuListener2() {
+        @Override
+        public void menuAboutToShow(IMenuManager manager) {
+            manager.add(new GroupMarker(IWorkbenchActionConstants.WB_START));
+//            manager.add(new GroupMarker(IWorkbenchActionConstants.NEW_EXT));
+//            manager.add(new GroupMarker(IWorkbenchActionConstants.IMPORT_EXT));
+//            manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+//            manager.add(new GroupMarker(IWorkbenchActionConstants.WB_END));
+        }
+        @Override
+        public void menuAboutToHide(IMenuManager manager) {
+        }
+    };
+
+    MenuListener menuListener = new MenuAdapter() {
+        @Override
+        public void menuShown(MenuEvent e) {
+            asyncExec(new Runnable() {
+                @Override
+                public void run() {
+                    final long time = System.currentTimeMillis();
+                    //System.out.println("popup shown: " + time);
+                    setHint(DiagramHints.POPUP_MENU_SHOWN, time);
+                    removeHint(DiagramHints.POPUP_MENU_HIDDEN);
+                }
+            });
+        }
+        @Override
+        public void menuHidden(MenuEvent e) {
+            asyncExec(new Runnable() {
+                @Override
+                public void run() {
+                    final long time = System.currentTimeMillis();
+                    //System.out.println("popup closed: " + time);
+                    removeHint(DiagramHints.POPUP_MENU_SHOWN);
+                    setHint(DiagramHints.POPUP_MENU_HIDDEN, time);
+                }
+            });
+        }
+    };
+
+    /**
+     * NOTE: this constructor must currently be invoked from the SWT display
+     * thread.
+     * 
+     * @param site
+     * @param control
+     * @param menuId
+     * @deprecated use {@link #SWTPopupMenuParticipant(IWorkbenchPartSite, Control, Display, String)} instead
+     */
+    public SWTPopupMenuParticipant(MPart part, Control control, String menuId) {
+        this(part, control, control.getDisplay(), menuId);
+    }
+
+    public SWTPopupMenuParticipant(MPart part, Control control, Display display, String menuId) {
+        super();
+        this.part = part;
+        this.control = control;
+        this.display = display;
+        this.menuId = menuId;
+        control.addListener(SWT.Dispose, new Listener() {
+
+            @Override
+            public void handleEvent(Event event) {
+                SWTPopupMenuParticipant.this.control = null;
+                if(menuManager != null) {
+                    menuManager.removeAll();
+                    menuManager.dispose();
+                    menuManager = null;
+                }
+            }
+            
+        });
+    }
+
+    @Override
+    public void addedToContext(ICanvasContext ctx) {
+        super.addedToContext(ctx);
+
+        display.asyncExec(new Runnable() {
+            @Override
+            public void run() {
+                if (control == null || control.isDisposed())
+                    return;
+                menuManager = createPopupMenu();
+                if (menuManager != null) {
+                    Menu menu = menuManager.createContextMenu(control);
+                    menu.addMenuListener(menuListener);
+                    control.setMenu(menu);
+                    if (part != null) {
+                        // #TODO Finish this when we are going to use full E4 workbench
+//                        site.registerContextMenu(menuManager.getId(), menuManager, wbsp);
+                    }
+                }
+            }
+        });
+
+        getHintStack().addKeyHintListener(DiagramHints.SHOW_POPUP_MENU, popupListener);
+    }
+
+    @Override
+    public void removedFromContext(ICanvasContext ctx) {
+        getHintStack().removeKeyHintListener(DiagramHints.SHOW_POPUP_MENU, popupListener);
+        super.removedFromContext(ctx);
+    }
+
+    protected MenuManager createPopupMenu() {
+        // #TODO Finish this when we are going to use full E4 workbench
+//        MPopupMenu popupMenu = MMenuFactory.INSTANCE.createPopupMenu();
+//        popupMenu.setLabel("Canvas Popup");
+//        popupMenu.setElementId(menuId);
+//        popupMenu.l
+        
+        final MenuManager mm = new MenuManager("Canvas Popup", menuId);
+        mm.setRemoveAllWhenShown(true);
+        mm.addMenuListener(menuManagerListener);
+        return mm;
+    }
+
+    @EventHandler(priority = 0)
+    public boolean handleCommands(CommandEvent e) {
+        if (e.command instanceof ShowPopup) {
+            showPopup(((ShowPopup) e.command).getControlPosition());
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param newValue
+     * @thread canvas-thread (AWT)
+     */
+    protected void showPopup(Point2D cp) {
+        setHint(DiagramHints.POPUP_MENU_CONTROL_POSITION, cp);
+        setHint(DiagramHints.POPUP_MENU_CANVAS_POSITION, trUtil.controlToCanvas(cp, null));
+        display.asyncExec(() -> {
+            if (control == null || control.isDisposed())
+                return;
+            Point p = control.toDisplay( SWTDPIUtil.downscaleSwtToInteger(cp) );
+            menuManager.getMenu().setLocation(p);
+            menuManager.getMenu().setVisible(true);
+        });
+    }
+
+}