broken import resize

mralexgray · Sep 22, 2011 · b6612fc · b6612fc
1 parent 74f713a
commit b6612fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/com/lewish/asciiflow/client/Canvas.java b/src/com/lewish/asciiflow/client/Canvas.java
@@ -230,6 +230,12 @@ public CellImpl getCell(int x, int y) {
 
 	public void drawCellStates(CellStateMap state) {
 		for (CellState cellState : state.getCellStates()) {
+			while (getWidth() < cellState.x && getWidth() < MAX_WIDTH) {
+				addColumn();
+			}
+			while (getHeight() < cellState.y && getHeight() < MAX_HEIGHT) {
+				addRow();
+			}
 			draw(cellState.x, cellState.y, cellState.value);
 		}
 	}

diff --git a/src/com/lewish/asciiflow/client/ImportWidget.java b/src/com/lewish/asciiflow/client/ImportWidget.java
@@ -56,13 +56,9 @@ protected void onShow() {
 
 	private void loadText(String text) {
 		CellStateMap state = new CellStateMap();
-		int maxWidth = 0;
 		int height = 0;
 		String[] lines = text.split("\n");
 		for(String line : lines) {
-			if(line.length() > maxWidth) {
-				maxWidth = line.length();
-			}
 			for(int i = 0; i< line.length(); i++) {
 				String val = new String(Character.toChars(line.codePointAt(i)));
 				if (!val.equals(" ")) {
@@ -71,13 +67,6 @@ private void loadText(String text) {
 			}
 			height++;
 		}
-		//Resize canvas
-		while(canvas.getWidth() < maxWidth) {
-			canvas.addColumn();
-		}
-		while(canvas.getHeight() < height) {
-			canvas.addRow();
-		}
 		storeModel.clearState();
 		EraseTool.draw(canvas);
 		canvas.drawCellStates(state);

diff --git a/src/com/lewish/asciiflow/client/StoreWidget.java b/src/com/lewish/asciiflow/client/StoreWidget.java
@@ -23,6 +23,7 @@
 import com.lewish.asciiflow.shared.State;
 import com.lewish.asciiflow.shared.Uri;
 
+// TODO: Seperate Presenter, MVP?
 @Singleton
 public class StoreWidget extends Composite implements ModelChangeHandler {