Skip to content
Snippets Groups Projects
Unverified Commit 134ecc11 authored by David Bohn's avatar David Bohn
Browse files

Retina on click support added. Please check wiki for details on this branch

parent 6b810128
No related branches found
No related tags found
1 merge request!6Overlay topology
...@@ -40,8 +40,6 @@ public class GraphWindow extends JFrame { ...@@ -40,8 +40,6 @@ public class GraphWindow extends JFrame {
} }
public static boolean isRetina() { public static boolean isRetina() {
//TODO: OS and JVM specific checks...
//if (SystemInfo.isJavaVersionAtLeast("1.7.0_40") && SystemInfo.isOracleJvm) {
GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
final GraphicsDevice device = env.getDefaultScreenDevice(); final GraphicsDevice device = env.getDefaultScreenDevice();
...@@ -52,14 +50,12 @@ public class GraphWindow extends JFrame { ...@@ -52,14 +50,12 @@ public class GraphWindow extends JFrame {
field.setAccessible(true); field.setAccessible(true);
Object scale = field.get(device); Object scale = field.get(device);
if (scale instanceof Integer && ((Integer) scale).intValue() == 2) { if (scale instanceof Integer && (Integer) scale == 2) {
return true; return true;
} }
} }
} catch (Exception ignore) { } catch (Exception ignore) {
} }
//}
//...
return false; return false;
} }
} }
...@@ -13,10 +13,6 @@ import java.util.Arrays; ...@@ -13,10 +13,6 @@ import java.util.Arrays;
public class ItemBuilderTemplate implements ItemBuilder { public class ItemBuilderTemplate implements ItemBuilder {
@Override @Override
public Item[] getItems(Graph graph) { public Item[] getItems(Graph graph) {
Node n = graph.getNodes().toArray()[0];
Edge[] edges = graph.getEdges(n).toArray();
Arrays.stream(edges).filter(edge -> edge.getSource() == n).map(Edge::getTarget);
//return new Item[]{new LabelItem(n)};
return new Item[0]; return new Item[0];
} }
......
...@@ -161,6 +161,7 @@ public class PreviewSketch extends JPanel implements MouseListener, MouseWheelLi ...@@ -161,6 +161,7 @@ public class PreviewSketch extends JPanel implements MouseListener, MouseWheelLi
Vector modelPos = new Vector(screenPos.x, screenPos.y); Vector modelPos = new Vector(screenPos.x, screenPos.y);
modelPos.sub(scaledTrans); modelPos.sub(scaledTrans);
modelPos.mult((isRetina) ? 2f : 1f);
modelPos.div(target.getScaling()); modelPos.div(target.getScaling());
modelPos.sub(target.getTranslate()); modelPos.sub(target.getTranslate());
return modelPos; return modelPos;
......
...@@ -26,7 +26,6 @@ public class RendererTemplate implements Renderer, MouseResponsiveRenderer { ...@@ -26,7 +26,6 @@ public class RendererTemplate implements Renderer, MouseResponsiveRenderer {
//Retrieve clicked node for the label: //Retrieve clicked node for the label:
LabelItem label = (LabelItem) item; LabelItem label = (LabelItem) item;
Node node = label.node; Node node = label.node;
System.out.println("Rendering");
//Finally draw your graphics for the node label in each target //Finally draw your graphics for the node label in each target
if (target instanceof G2DTarget) { if (target instanceof G2DTarget) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment