external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove remaining references to java.awt from forge-gui and forge-gui-mobile

Browse Source
This commit is contained in:
drdev
2014-04-27 22:07:12 +00:00
parent 8858249b69
commit e6efda2716
31 changed files with 134 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui-mobile/src/forge/GuiMobile.java
View File

@@ -5,6 +5,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.tuple.Pair;
import com.badlogic.gdx.Gdx;
@@ -329,4 +330,14 @@ public class GuiMobile implements IGuiBase {
public File getSaveFile(File defaultFile) {
return defaultFile; //TODO: Show dialog
}
@Override
public void copyToClipboard(String text) {
Forge.getClipboard().setContents(text);
}
@Override
public void browseToUrl(String url) throws Exception {
Gdx.net.openURI(url);
}
}

4
forge-gui-mobile/src/forge/assets/FSkinColor.java
View File

@@ -169,9 +169,9 @@ public class FSkinColor {
* Returns opaque (non-alpha) stepped color.
* Plus for lighter, minus for darker.
*
* @param clr0 {@link java.awt.Color}
* @param clr0 {Color}
* @param step int
* @return {@link java.awt.Color}
* @return {@link Color}
*/
public static Color stepColor(Color clr0, int step) {
float r = clr0.r * 255;

10
forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
View File

@@ -23,12 +23,12 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import java.awt.Point;
import java.util.*;
import java.util.Map.Entry;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.math.Vector2;
public class ImageView<T extends InventoryItem> extends ItemView<T> {
private static final float PADDING = 5;
@@ -54,8 +54,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private GroupDef groupBy = null;
private boolean lockHoveredItem = false;
private boolean lockInput = false;
private Point hoverPoint;
private Point hoverScrollPos;
private Vector2 hoverPoint;
private Vector2 hoverScrollPos;
private ItemInfo hoveredItem;
private ItemInfo focalItem;
private final ArrayList<ItemInfo> orderedItems = new ArrayList<ItemInfo>();
@@ -667,7 +667,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
}
}
private boolean updateHoveredItem(Point hoverPoint0, Point hoverScrollPos0) {
private boolean updateHoveredItem(Vector2 hoverPoint0, Vector2 hoverScrollPos0) {
hoverPoint = hoverPoint0;
if (hoverScrollPos != hoverScrollPos0) {
hoverScrollPos = hoverScrollPos0;
@@ -679,7 +679,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
ItemInfo item = null;
FScrollPane scroller = getScroller();
if (hoverPoint0 != null) {
Point displayPoint = new Point(hoverPoint0);
Vector2 displayPoint = new Vector2(hoverPoint0);
//account for change in scroll positions since mouse last moved
displayPoint.x += scroller.getScrollLeft() - hoverScrollPos0.x;
displayPoint.y += scroller.getScrollTop() - hoverScrollPos0.y;