BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 17:22:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

consolidated menus

Browse Source
This commit is contained in:
bancika
2017-01-04 16:53:38 +01:00
parent 97e44fba1e
commit 3a419c0959
11 changed files with 93 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/org/diylc/common/IKeyProcessor.java
+2
View File
@@ -6,6 +6,8 @@ public interface IKeyProcessor {
public static final int VK_UP = 0x26;
public static final int VK_RIGHT = 0x27;
public static final int VK_DOWN = 0x28;
public static final int VK_H = 0x48;
public static final int VK_V = 0x56;
/**
* Notifies the presenter that a key hes been pressed on the canvas.
diylc/diylc-core/src/org/diylc/presenter/ComponentProcessor.java
-1
View File
@@ -9,7 +9,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+13 -4
View File
@@ -559,7 +559,7 @@ public class Presenter implements IPlugInPort {
|| !newSelection.contains(topComponent)) {
newSelection.clear();
}
newSelection.addAll(findAllGroupedComponents(topComponent));
}
}
@@ -575,7 +575,8 @@ public class Presenter implements IPlugInPort {
@Override
public boolean keyPressed(int key, boolean ctrlDown, boolean shiftDown, boolean altDown) {
if (key != VK_DOWN && key != VK_LEFT && key != VK_UP && key != VK_RIGHT) {
if (key != VK_DOWN && key != VK_LEFT && key != VK_UP && key != VK_RIGHT && key != IKeyProcessor.VK_H
&& key != IKeyProcessor.VK_V) {
return false;
}
LOG.debug(String.format("keyPressed(%s, %s, %s, %s)", key, ctrlDown, shiftDown, altDown));
@@ -609,6 +610,12 @@ public class Presenter implements IPlugInPort {
} else if (key == IKeyProcessor.VK_LEFT) {
oldProject = currentProject.clone();
rotateComponents(this.selectedComponents, -1, snapToGrid);
} else if (key == IKeyProcessor.VK_H) {
oldProject = currentProject.clone();
mirrorSelection(ISelectionProcessor.HORIZONTAL);
} else if (key == IKeyProcessor.VK_V) {
oldProject = currentProject.clone();
mirrorSelection(ISelectionProcessor.VERTICAL);
} else
return false;
messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED, oldProject, currentProject.clone(),
@@ -1898,12 +1905,14 @@ public class Presenter implements IPlugInPort {
ComponentType selectedType = null;
Iterator<IDIYComponent<?>> iterator = this.selectedComponents.iterator();
while (iterator.hasNext()) {
ComponentType type = ComponentProcessor.getInstance().extractComponentTypeFrom((Class<? extends IDIYComponent<?>>) iterator.next().getClass());
ComponentType type =
ComponentProcessor.getInstance().extractComponentTypeFrom(
(Class<? extends IDIYComponent<?>>) iterator.next().getClass());
if (selectedType == null)
selectedType = type;
else if (selectedType.getInstanceClass() != type.getInstanceClass())
throw new RuntimeException("Template can be applied on multiple components of the same type only");
}
}
return getTemplatesFor(selectedType.getCategory(), selectedType.getName());
}