scratchfoundation/scratch-flash
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-flash.git synced 2024-12-04 21:21:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into list-delete-button

Browse source 
Conflicts:
	src/watchers/ListCell.as
This commit is contained in:
Nathan Dinsmore 2014-05-28 18:15:05 -04:00
commit 01a711674a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Scratch.as
View file

@ -53,7 +53,7 @@ package {
public class Scratch extends Sprite {
// Version
public static const versionString:String = 'v418';
public static const versionString:String = 'v419';
public static var app:Scratch; // static reference to the app, used for debugging
// Display modes

10
src/watchers/ListCell.as
View file

@ -21,13 +21,15 @@ package watchers {
import flash.display.Sprite;
import flash.events.*;
import flash.utils.*;
import flash.geom.ColorTransform;
import flash.text.*;
import uiwidgets.*;
import util.Color;
public class ListCell extends Sprite {
private const format:TextFormat = new TextFormat(CSS.font, 11, 0xFFFFFF, true);
private static var normalColor:int = Specs.listColor;
private static var focusedColor:int = Color.mixRGB(Color.scaleBrightness(Specs.listColor, 2), 0xEEEEEE, 0.6);
public var tf:TextField;
private var frame:ResizeableFrame;
@ -35,7 +37,7 @@ public class ListCell extends Sprite {
private var deleteItem:Function;
public function ListCell(s:String, width:int, whenChanged:Function, keyPress:Function, deleteItem:Function) {
frame = new ResizeableFrame(0xFFFFFF, Specs.listColor, 6, true);
frame = new ResizeableFrame(0xFFFFFF, normalColor, 6, true);
addChild(frame);
addTextField(whenChanged, keyPress);
tf.text = s;
@ -82,11 +84,9 @@ public class ListCell extends Sprite {
tf.setSelection(0, tf.text.length);
}
private static var focused:ColorTransform = new ColorTransform(1, 1, 1, 1, 128, 128, 128, 0);
private static var normal:ColorTransform = new ColorTransform(1, 1, 1, 1, 0, 0, 0, 0);
private function focusChange(e:FocusEvent):void {
var hasFocus:Boolean = (e.type == FocusEvent.FOCUS_IN);
frame.transform.colorTransform = (hasFocus ? focused : normal);
frame.setColor(hasFocus ? focusedColor : normalColor);
tf.textColor = (hasFocus ? 0 : 0xFFFFFF);
setTimeout(hasFocus ? addDeleteButton : removeDeleteButton, 1);
}