Skip to content

Commit

Permalink
继续优化
Browse files Browse the repository at this point in the history
  • Loading branch information
anlun214 committed Apr 10, 2017
1 parent 271a2ee commit 4701ac7
Show file tree
Hide file tree
Showing 8 changed files with 265 additions and 231 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
修复annie.DisplayObject渲染刷新优化无效的bug
修复annie.FloatDisplay,annie.InputText在横屏情况下旋转会失效的bug
修复annieUI.SlidePage类设置横向滑动失效的问题
修复在子级里有FloatDisplay相关类对象时,设置父级的visible或者父级的alpha为0里,floatDisplay对象不能隐藏的bug
优化按钮元件鼠标按下后的状态,以前是按下后固定跳到第二个状态。现在优化成如果有第三个状态,则跳到第三个,没有的话再跳到第二个
新增了annie.Timer类
新增了annie.MouseEvent和annie.TouchEvent的updateAfterEvent方法
Expand Down
10 changes: 10 additions & 0 deletions annie/display/FloatDisplay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,16 @@ namespace annie {
if (o) {
let style = o.style;
let visible = s._visible;
if(visible){
let parent = s.parent;
while (parent) {
if(!parent._visible){
visible=false;
break;
}
parent=parent.parent;
}
}
let show = visible ? "block" : "none";
if (show != style.display) {
style.display = show;
Expand Down
1 change: 0 additions & 1 deletion annie/display/InputText.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ namespace annie {
});
s.init(input);
}

public init(htmlElement: any): void {
super.init(htmlElement);
//默认设置
Expand Down
Loading

0 comments on commit 4701ac7

Please sign in to comment.