ncannasse 7 år sedan
förälder
incheckning
5f78d232ac
4 ändrade filer med 7 tillägg och 5 borttagningar
  1. 2 2
      bin/cdb.css
  2. 2 2
      bin/cdb.less
  3. 1 1
      hide/comp/SceneEditor.hx
  4. 2 0
      hide/comp/cdb/Editor.hx

+ 2 - 2
bin/cdb.css

@@ -287,10 +287,10 @@
   text-decoration: underline dashed red;
   text-decoration: underline dashed red;
 }
 }
 .cdb .cdb-sheet div.cdb-script .scriptErrorMessage {
 .cdb .cdb-sheet div.cdb-script .scriptErrorMessage {
-  background: rgba(255, 5, 5, 0.4);
+  background: #500505;
   color: red;
   color: red;
   position: absolute;
   position: absolute;
   margin-top: -20px;
   margin-top: -20px;
   padding: 2px;
   padding: 2px;
-  border: 1px solid red;
+  border: 1px solid #A00;
 }
 }

+ 2 - 2
bin/cdb.less

@@ -319,12 +319,12 @@
 				text-decoration: underline dashed red;
 				text-decoration: underline dashed red;
 			}
 			}
 			.scriptErrorMessage {
 			.scriptErrorMessage {
-				background : rgba(255, 5, 5, 0.4);
+				background : rgba(80, 5, 5, 1);
 				color : red;
 				color : red;
 				position: absolute;
 				position: absolute;
 				margin-top : -20px;
 				margin-top : -20px;
 				padding: 2px;
 				padding: 2px;
-				border: 1px solid red;
+				border: 1px solid #A00;
 			}
 			}
 		}
 		}
 
 

+ 1 - 1
hide/comp/SceneEditor.hx

@@ -608,7 +608,7 @@ class SceneEditor {
 			return;
 			return;
 		}
 		}
 		inLassoMode = true;
 		inLassoMode = true;
-		var g = new h2d.Sprite(scene.s2d);
+		var g = new h2d.Object(scene.s2d);
 		var overlay = new h2d.Bitmap(h2d.Tile.fromColor(0xffffff, 10000, 10000, 0.1), g);
 		var overlay = new h2d.Bitmap(h2d.Tile.fromColor(0xffffff, 10000, 10000, 0.1), g);
 		var intOverlay = new h2d.Interactive(10000, 10000, scene.s2d);
 		var intOverlay = new h2d.Interactive(10000, 10000, scene.s2d);
 		var lastPt = new h2d.col.Point(scene.s2d.mouseX, scene.s2d.mouseY);
 		var lastPt = new h2d.col.Point(scene.s2d.mouseX, scene.s2d.mouseY);

+ 2 - 0
hide/comp/cdb/Editor.hx

@@ -27,6 +27,8 @@ class Editor extends Component {
 		this.sheet = sheet;
 		this.sheet = sheet;
 		element.attr("tabindex", 0);
 		element.attr("tabindex", 0);
 		element.on("keypress", function(e) {
 		element.on("keypress", function(e) {
+			if( e.target.nodeName == "INPUT" )
+				return;
 			var cell = cursor.getCell();
 			var cell = cursor.getCell();
 			if( cell != null && cell.isTextInput() && !e.ctrlKey )
 			if( cell != null && cell.isTextInput() && !e.ctrlKey )
 				cell.edit();
 				cell.edit();