Skip to content

Commit

Permalink
4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@ianharrigan
ianharrigan committed Feb 19, 2021
1 parent 4d120b6 commit e5721e8
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 45 deletions.
38 changes: 19 additions & 19 deletions haxe/ui/backend/ComponentImpl.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class ComponentImpl extends ComponentBase {
}

private override function get_isNativeScroller():Bool {
if (Std.is(this, ScrollView) && cast(this, Component).native == true) {
if ((this is ScrollView) && cast(this, Component).native == true) {
return true;
}
return false;
Expand All @@ -120,7 +120,7 @@ class ComponentImpl extends ComponentBase {
private override function handleCreate(native:Bool) {
var newElement = null;
if (native == true) {
if (Std.is(this, ScrollView)) { // special case for scrollview
if ((this is ScrollView)) { // special case for scrollview
_nativeElement = new NativeElement(cast this);
if (element == null) {
element = _nativeElement.create();
Expand Down Expand Up @@ -156,7 +156,7 @@ class ComponentImpl extends ComponentBase {
}

if (newElement == null) {
if (Std.is(this, ScrollView)) {
if ((this is ScrollView)) {
_nativeElement = null;
if (element == null) {
element = Browser.document.createDivElement();
Expand All @@ -173,7 +173,7 @@ class ComponentImpl extends ComponentBase {
newElement = Browser.document.createDivElement();
newElement.classList.add("haxeui-component");

if (Std.is(this, Image)) {
if ((this is Image)) {
newElement.style.boxSizing = "initial";
}

Expand Down Expand Up @@ -221,7 +221,7 @@ class ComponentImpl extends ComponentBase {
element.style.top = HtmlUtils.px(top);
}

if (Std.is(this, TableView) && left != null && top != null && cast(this, TableView).native == true) {
if ((this is TableView) && left != null && top != null && cast(this, TableView).native == true) {
var c:Component = cast(this, Component);
var h = c.findComponent(Header);
h.element.style.left = '${HtmlUtils.px(h.screenLeft)}';
Expand All @@ -239,7 +239,7 @@ class ComponentImpl extends ComponentBase {
return;
}

if (Std.is(this, VerticalProgress)) { // this is a hack for chrome
if ((this is VerticalProgress)) { // this is a hack for chrome
if (element.style.getPropertyValue("transform-origin") != null && element.style.getPropertyValue("transform-origin").length > 0) {
var tw = width;
var th = height;
Expand Down Expand Up @@ -298,9 +298,9 @@ class ComponentImpl extends ComponentBase {
private override function handleClipRect(value:Rectangle) {
var c:Component = cast(this, Component);
var parent:Component = c.parentComponent;
if (value != null && parent != null && (parent._nativeElement == null || Std.is(c, Header))) {
if (value != null && parent != null && (parent._nativeElement == null || (c is Header))) {
element.style.clip = 'rect(${HtmlUtils.px(value.top)},${HtmlUtils.px(value.right)},${HtmlUtils.px(value.bottom)},${HtmlUtils.px(value.left)})';
if (Std.is(this, Header) && parent.native == true) {
if ((this is Header) && parent.native == true) {
if (element.style.position != "fixed") {
element.style.position = "fixed";
}
Expand Down Expand Up @@ -397,21 +397,21 @@ class ComponentImpl extends ComponentBase {
setCursor(style.cursor);

if (style.filter != null) {
if (Std.is(style.filter[0], DropShadow)) {
if ((style.filter[0] is DropShadow)) {
var dropShadow:DropShadow = cast style.filter[0];
if (dropShadow.inner == false) {
element.style.boxShadow = '${dropShadow.distance}px ${dropShadow.distance + 2}px ${dropShadow.blurX - 1}px ${dropShadow.blurY - 1}px ${HtmlUtils.rgba(dropShadow.color, dropShadow.alpha)}';
} else {
element.style.boxShadow = 'inset ${dropShadow.distance}px ${dropShadow.distance}px ${dropShadow.blurX}px 0px ${HtmlUtils.rgba(dropShadow.color, dropShadow.alpha)}';
}
} else if (Std.is(style.filter[0], Blur)) {
} else if ((style.filter[0] is Blur)) {
var blur:Blur = cast style.filter[0];
element.style.setProperty("-webkit-filter", 'blur(${blur.amount}px)');
element.style.setProperty("-moz-filter", 'blur(${blur.amount}px)');
element.style.setProperty("-o-filter", 'blur(${blur.amount}px)');
//element.style.setProperty("-ms-filter", 'blur(${blur.amount}px)');
element.style.setProperty("filter", 'blur(${blur.amount}px)');
} else if (Std.is(style.filter[0], Grayscale)) {
} else if ((style.filter[0] is Grayscale)) {
var grayscale:Grayscale = cast style.filter[0];
element.style.setProperty("-webkit-filter", 'grayscale(${grayscale.amount}%)');
element.style.setProperty("-moz-filter", 'grayscale(${grayscale.amount}%)');
Expand All @@ -430,7 +430,7 @@ class ComponentImpl extends ComponentBase {
}

if (style.backdropFilter != null) {
if (Std.is(style.backdropFilter[0], Blur)) {
if ((style.backdropFilter[0] is Blur)) {
var blur:Blur = cast style.backdropFilter[0];
element.style.setProperty("backdrop-filter", 'blur(${blur.amount}px)');
}
Expand Down Expand Up @@ -574,9 +574,9 @@ class ComponentImpl extends ComponentBase {
case UIEvent.CHANGE:
if (_eventMap.exists(type) == false) {
_eventMap.set(type, listener);
if (Std.is(this, TextField) || Std.is(this, TextArea)) {
if ((this is TextField) || (this is TextArea)) {
element.addEventListener(EventMapper.HAXEUI_TO_DOM.get(KeyboardEvent.KEY_UP), __onTextFieldChangeEvent);
} else if (Std.is(this, InteractiveComponent)) {
} else if ((this is InteractiveComponent)) {
element.addEventListener(EventMapper.HAXEUI_TO_DOM.get(type), __onChangeEvent);
}
}
Expand Down Expand Up @@ -610,7 +610,7 @@ class ComponentImpl extends ComponentBase {
element.removeEventListener(EventMapper.HAXEUI_TO_DOM.get(type), __onKeyboardEvent);
case UIEvent.CHANGE:
_eventMap.remove(type);
if (Std.is(this, TextField)) {
if ((this is TextField)) {
element.removeEventListener(EventMapper.HAXEUI_TO_DOM.get(KeyboardEvent.KEY_UP), __onTextFieldChangeEvent);
} else {
element.removeEventListener(EventMapper.HAXEUI_TO_DOM.get(type), __onChangeEvent);
Expand Down Expand Up @@ -676,15 +676,15 @@ class ComponentImpl extends ComponentBase {
mouseEvent._originalEvent = event;
var touchEvent = false;
try {
touchEvent = Std.is(event, js.html.TouchEvent);
touchEvent = (event is js.html.TouchEvent);
} catch (e:Dynamic) { }

if (touchEvent == true) {
var te:js.html.TouchEvent = cast(event, js.html.TouchEvent);
mouseEvent.screenX = (te.changedTouches[0].pageX - Screen.instance.container.offsetLeft) / Toolkit.scaleX;
mouseEvent.screenY = (te.changedTouches[0].pageY - Screen.instance.container.offsetTop) / Toolkit.scaleY;
mouseEvent.touchEvent = true;
} else if (Std.is(event, js.html.MouseEvent)) {
} else if ((event is js.html.MouseEvent)) {
var me:js.html.MouseEvent = cast(event, js.html.MouseEvent);
mouseEvent.buttonDown = (me.buttons != 0);
mouseEvent.screenX = (me.pageX - Screen.instance.container.offsetLeft) / Toolkit.scaleX;
Expand Down Expand Up @@ -715,7 +715,7 @@ class ComponentImpl extends ComponentBase {
var delta:Float = 0;
if (Reflect.field(event, "wheelDelta") != null) {
delta = Reflect.field(event, "wheelDelta");
} else if (Std.is(event, WheelEvent)) {
} else if ((event is WheelEvent)) {
delta = cast(event, WheelEvent).deltaY;
} else {
delta = -event.detail;
Expand All @@ -741,7 +741,7 @@ class ComponentImpl extends ComponentBase {
var keyboardEvent = new KeyboardEvent(type);
keyboardEvent._originalEvent = event;

if (Std.is(event, js.html.KeyboardEvent)) {
if ((event is js.html.KeyboardEvent)) {
var me:js.html.KeyboardEvent = cast(event, js.html.KeyboardEvent);
keyboardEvent.keyCode = me.keyCode;
keyboardEvent.altKey = me.altKey;
Expand Down
4 changes: 2 additions & 2 deletions haxe/ui/backend/ScreenImpl.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,15 +309,15 @@ class ScreenImpl extends ScreenBase {

var touchEvent = false;
try {
touchEvent = Std.is(event, js.html.TouchEvent);
touchEvent = (event is js.html.TouchEvent);
} catch (e:Dynamic) { }

if (touchEvent == true) {
var te:js.html.TouchEvent = cast(event, js.html.TouchEvent);
mouseEvent.screenX = (te.changedTouches[0].pageX - Screen.instance.container.offsetLeft) / Toolkit.scaleX;
mouseEvent.screenY = (te.changedTouches[0].pageY - Screen.instance.container.offsetTop) / Toolkit.scaleY;
mouseEvent.touchEvent = true;
} else if (Std.is(event, js.html.MouseEvent)) {
} else if ((event is js.html.MouseEvent)) {
var me:js.html.MouseEvent = cast(event, js.html.MouseEvent);
mouseEvent.buttonDown = (me.buttons != 0);
mouseEvent.screenX = (me.pageX - Screen.instance.container.offsetLeft) / Toolkit.scaleX;
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/backend/TextDisplayImpl.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ class TextDisplayImpl extends TextBase {

private var autoWidth(get, null):Bool;
private function get_autoWidth():Bool {
if (Std.is(parentComponent, Label)) {
if ((parentComponent is Label)) {
return cast(parentComponent, Label).autoWidth;
}
return false;
Expand Down
22 changes: 11 additions & 11 deletions haxe/ui/backend/TextInputImpl.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class TextInputImpl extends TextDisplayImpl {

private function onChangeEvent(e) {
var newText = null;
if (Std.is(parentComponent, TextArea)) {
if ((parentComponent is TextArea)) {
newText = cast(element, TextAreaElement).value;
} else {
newText = cast(element, InputElement).value;
Expand Down Expand Up @@ -60,9 +60,9 @@ class TextInputImpl extends TextDisplayImpl {
private override function validateData() {
if (_text != null) {
var html:String = normalizeText(_text);
if (Std.is(element, InputElement)) {
if ((element is InputElement)) {
cast(element, InputElement).value = html;
} else if (Std.is(element, TextAreaElement)) {
} else if ((element is TextAreaElement)) {
cast(element, TextAreaElement).value = html;
}
}
Expand All @@ -82,8 +82,8 @@ class TextInputImpl extends TextDisplayImpl {
private override function validateStyle():Bool {
var measureTextRequired:Bool = false;

if ((_displayData.multiline == false && Std.is(element, InputElement) == false)
|| (_displayData.multiline == true && Std.is(element, TextAreaElement) == false)) {
if ((_displayData.multiline == false && (element is InputElement) == false)
|| (_displayData.multiline == true && (element is TextAreaElement) == false)) {
var newElement:Element = createElement();
element.parentElement.appendChild(newElement);
HtmlUtils.removeElement(element);
Expand All @@ -98,7 +98,7 @@ class TextInputImpl extends TextDisplayImpl {
measureTextRequired = true;
}

if (Std.is(element, InputElement)) {
if ((element is InputElement)) {
var inputElement:InputElement = cast element;
if (_inputData.password == true && inputElement.type != "password") {
inputElement.type = "password";
Expand All @@ -111,16 +111,16 @@ class TextInputImpl extends TextDisplayImpl {
#if !haxeui_builder
element.style.cursor = "not-allowed";
#end
if (Std.is(element, InputElement)) {
if ((element is InputElement)) {
cast(element, InputElement).disabled = true;
} else if (Std.is(element, TextAreaElement)) {
} else if ((element is TextAreaElement)) {
cast(element, TextAreaElement).disabled = true;
}
} else {
element.style.cursor = null;
if (Std.is(element, InputElement)) {
if ((element is InputElement)) {
cast(element, InputElement).disabled = false;
} else if (Std.is(element, TextAreaElement)) {
} else if ((element is TextAreaElement)) {
cast(element, TextAreaElement).disabled = false;
}
}
Expand All @@ -129,7 +129,7 @@ class TextInputImpl extends TextDisplayImpl {
}

private override function measureText() {
if (Std.is(element, TextAreaElement)) {
if ((element is TextAreaElement)) {
_textWidth = cast(element, TextAreaElement).scrollWidth;
_textHeight = cast(element, TextAreaElement).scrollHeight;
} else {
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/backend/html5/native/NativeElement.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class NativeElement {

/*
private function onChange(e) {
if (Std.is(_component, Slider)) {
if ((_component is Slider)) {
var input:InputElement = cast _component.element;
cast(_component, Slider).pos = Std.parseFloat(input.value);
}
Expand Down
8 changes: 4 additions & 4 deletions haxe/ui/backend/html5/native/behaviours/ElementPlaceholder.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ import js.html.TextAreaElement;
class ElementPlaceholder extends Behaviour {
public override function set(value:Variant) {
var el:Element = _component.element;
if (Std.is(el, TextAreaElement)) {
if ((el is TextAreaElement)) {
cast(el, TextAreaElement).placeholder = value;
} else if (Std.is(el, InputElement)){
} else if ((el is InputElement)){
cast(el, InputElement).placeholder = value;
}
}

public override function get():Variant {
var el:Element = _component.element;
if (Std.is(el, TextAreaElement)) {
if ((el is TextAreaElement)) {
return cast(el, TextAreaElement).placeholder;
} else if (Std.is(el, InputElement)){
} else if ((el is InputElement)){
return cast(el, InputElement).placeholder;
} else {
return null;
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/backend/html5/native/behaviours/ElementValue.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import js.html.TextAreaElement;
class ElementValue extends DataBehaviour {
public override function validateData() {
var el:Element = _component.element;
if (Std.is(el, TextAreaElement)) {
if ((el is TextAreaElement)) {
cast(el, TextAreaElement).value = StringTools.replace(_value, "\\n", "\n");
} else {
el.setAttribute("value", _value);
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/backend/html5/native/behaviours/SpanText.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class SpanText extends DataBehaviour {
if (list.length != 0) {
for (n in 0...list.length) {
var child = list.item(n);
if (Std.is(child, InputElement) && cast(child, InputElement).type == type) {
if ((child is InputElement) && cast(child, InputElement).type == type) {
input = cast child;
break;
}
Expand Down
4 changes: 2 additions & 2 deletions haxe/ui/backend/html5/native/layouts/ButtonLayout.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ class ButtonLayout extends DefaultLayout {

switch (component.style.iconPosition) {
case "top" | "left" | null:
if (Std.is(first, ImageElement) == false) {
if ((first is ImageElement) == false) {
HtmlUtils.swapElements(first, last);
}
case "right" | "bottom":
if (Std.is(last, ImageElement) == false) {
if ((last is ImageElement) == false) {
HtmlUtils.swapElements(first, last);
}
default:
Expand Down
6 changes: 3 additions & 3 deletions haxe/ui/backend/html5/native/size/ElementSize.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import haxe.ui.layouts.DelegateLayout.DelegateLayoutSize;
class ElementSize extends DelegateLayoutSize {
private override function get_width():Float {
var w:Float = component.element.offsetWidth;
if (Std.is(component, VerticalSlider)) {
if ((component is VerticalSlider)) {
if (w == component.element.offsetHeight) {
w = 21;
}
} else if (Std.is(component, VerticalProgress)) {
} else if ((component is VerticalProgress)) {
if (component.element.offsetWidth > component.element.offsetHeight) {
w = component.element.offsetHeight;
}
Expand All @@ -22,7 +22,7 @@ class ElementSize extends DelegateLayoutSize {

private override function get_height():Float {
var h:Float = component.element.offsetHeight;
if (Std.is(component, VerticalProgress)) {
if ((component is VerticalProgress)) {
if (component.element.offsetWidth > component.element.offsetHeight) {
h = component.element.offsetWidth;
}
Expand Down

0 comments on commit e5721e8

Please sign in to comment.