From 510f258b6d5a1108ff011805181b111355c52e39 Mon Sep 17 00:00:00 2001 From: Ian Harrigan Date: Tue, 8 Oct 2024 22:37:30 +0200 Subject: [PATCH] remove old "scriptAccess" property --- haxe/ui/backend/DialogBase.hx | 7 ----- haxe/ui/components/Button.hx | 2 -- haxe/ui/components/Calendar.hx | 1 - haxe/ui/components/CheckBox.hx | 2 -- haxe/ui/components/DropDown.hx | 4 --- haxe/ui/components/NumberStepper.hx | 3 --- haxe/ui/components/OptionStepper.hx | 3 --- haxe/ui/components/Scroll.hx | 1 - haxe/ui/components/SectionHeader.hx | 2 -- haxe/ui/components/Slider.hx | 4 --- haxe/ui/components/Switch.hx | 1 - haxe/ui/components/TabBar.hx | 4 --- haxe/ui/components/TextArea.hx | 3 --- haxe/ui/components/TextField.hx | 1 - haxe/ui/components/pickers/ItemPicker.hx | 1 - haxe/ui/containers/Accordion.hx | 1 - haxe/ui/containers/ButtonBar.hx | 1 - haxe/ui/containers/Card.hx | 6 +---- haxe/ui/containers/Collapsible.hx | 1 - haxe/ui/containers/Frame.hx | 6 ----- haxe/ui/containers/ScrollView.hx | 2 -- haxe/ui/containers/TreeViewNode.hx | 1 - .../containers/dialogs/CollapsibleDialog.hx | 1 - haxe/ui/containers/menus/MenuCheckBox.hx | 4 --- haxe/ui/containers/menus/MenuItem.hx | 4 --- haxe/ui/containers/menus/MenuOptionBox.hx | 5 ---- haxe/ui/containers/menus/MenuSeparator.hx | 1 - .../properties/PropertyGroup_OLD.hx | 8 ------ haxe/ui/containers/windows/WindowList.hx | 9 +++---- haxe/ui/core/Component.hx | 27 ------------------- haxe/ui/locale/LocaleManager.hx | 3 --- 31 files changed, 5 insertions(+), 114 deletions(-) diff --git a/haxe/ui/backend/DialogBase.hx b/haxe/ui/backend/DialogBase.hx index 274071a4f..23d2d64f5 100644 --- a/haxe/ui/backend/DialogBase.hx +++ b/haxe/ui/backend/DialogBase.hx @@ -38,13 +38,11 @@ class DialogBase extends Box implements Draggable { dialogContainer = new haxe.ui.containers.VBox(); dialogContainer.id = "dialog-container"; dialogContainer.styleNames = "dialog-container"; - dialogContainer.scriptAccess = false; addComponent(dialogContainer); dialogTitle = new haxe.ui.containers.HBox(); dialogTitle.id = "dialog-title"; dialogTitle.styleNames = "dialog-title"; - dialogTitle.scriptAccess = false; dragInitiator = dialogTitle; dialogContainer.addComponent(dialogTitle); @@ -52,32 +50,27 @@ class DialogBase extends Box implements Draggable { dialogTitleLabel.id = "dialog-title-label"; dialogTitleLabel.styleNames = "dialog-title-label"; dialogTitleLabel.text = "HaxeUI"; - dialogTitleLabel.scriptAccess = false; dialogTitle.addComponent(dialogTitleLabel); dialogCloseButton = new haxe.ui.components.Image(); dialogCloseButton.id = "dialog-close-button"; dialogCloseButton.styleNames = "dialog-close-button"; - dialogCloseButton.scriptAccess = false; dialogTitle.addComponent(dialogCloseButton); dialogContent = new haxe.ui.containers.VBox(); dialogContent.id = "dialog-content"; dialogContent.styleNames = "dialog-content"; - dialogContent.scriptAccess = false; dialogContent.registerEvent(UIEvent.RESIZE, onContentResize); dialogContainer.addComponent(dialogContent); dialogFooterContainer = new haxe.ui.containers.Box(); dialogFooterContainer.id = "dialog-footer-container"; dialogFooterContainer.styleNames = "dialog-footer-container"; - dialogFooterContainer.scriptAccess = false; dialogContainer.addComponent(dialogFooterContainer); dialogFooter = new haxe.ui.containers.HBox(); dialogFooter.id = "dialog-footer"; dialogFooter.styleNames = "dialog-footer"; - dialogFooter.scriptAccess = false; dialogFooter.registerEvent(UIEvent.RESIZE, onFooterResize); dialogFooterContainer.addComponent(dialogFooter); diff --git a/haxe/ui/components/Button.hx b/haxe/ui/components/Button.hx index 58a0afe25..3be53c9c6 100644 --- a/haxe/ui/components/Button.hx +++ b/haxe/ui/components/Button.hx @@ -462,7 +462,6 @@ private class TextBehaviour extends DataBehaviour { if (label == null) { label = new Label(); label.id = "button-label"; - label.scriptAccess = false; _component.addComponent(label); _component.invalidateComponentStyle(true); } @@ -487,7 +486,6 @@ private class IconBehaviour extends DataBehaviour { icon = new Image(); icon.addClass("icon"); icon.id = "button-icon"; - icon.scriptAccess = false; _component.addComponentAt(icon, 0); _component.invalidateComponentStyle(true); } diff --git a/haxe/ui/components/Calendar.hx b/haxe/ui/components/Calendar.hx index d99ce132e..6b87a4072 100644 --- a/haxe/ui/components/Calendar.hx +++ b/haxe/ui/components/Calendar.hx @@ -313,7 +313,6 @@ private class Builder extends CompositeBuilder { for (_ in 0...6) { for (_ in 0...7) { var item = new Button(); - item.scriptAccess = false; _calendar.addComponent(item); } } diff --git a/haxe/ui/components/CheckBox.hx b/haxe/ui/components/CheckBox.hx index 9d09cc614..b530f768a 100644 --- a/haxe/ui/components/CheckBox.hx +++ b/haxe/ui/components/CheckBox.hx @@ -116,7 +116,6 @@ private class TextBehaviour extends DataBehaviour { label = new Label(); label.id = '${_component.cssName}-label'; label.addClass('${_component.cssName}-label'); - label.scriptAccess = false; _component.addComponent(label); _component.invalidateComponentStyle(true); } @@ -241,7 +240,6 @@ class CheckBoxBuilder extends CompositeBuilder { var value = new CheckBoxValue(); value.id = '${_checkbox.cssName}-value'; value.addClass('${_checkbox.cssName}-value'); - value.scriptAccess = false; _checkbox.addComponent(value); } } diff --git a/haxe/ui/components/DropDown.hx b/haxe/ui/components/DropDown.hx index 1eedc4e2d..556030aaa 100644 --- a/haxe/ui/components/DropDown.hx +++ b/haxe/ui/components/DropDown.hx @@ -726,18 +726,15 @@ class DropDownEvents extends ButtonEvents { var searchContainer = new VBox(); searchContainer.id = "dropdown-search-container"; searchContainer.addClass("dropdown-search-container"); - searchContainer.scriptAccess = false; var searchFieldContainer = new HBox(); searchFieldContainer.id = "dropdown-search-field-container"; searchFieldContainer.addClass("dropdown-search-field-container"); - searchFieldContainer.scriptAccess = false; searchFieldContainer.addComponent(searchField); var searchFieldSeparator = new Component(); searchFieldSeparator.id = "dropdown-search-field-separator"; searchFieldSeparator.addClass("dropdown-search-field-separator"); - searchFieldSeparator.scriptAccess = false; searchContainer.addComponent(searchFieldContainer); searchContainer.addComponent(searchFieldSeparator); @@ -883,7 +880,6 @@ class DropDownEvents extends ButtonEvents { searchField.id = "dropdown-search-field"; searchField.addClass("dropdown-search-field"); searchField.placeholder = _dropdown.searchPrompt; - searchField.scriptAccess = false; searchField.registerEvent(UIEvent.CHANGE, onSearchChange); return searchField; } diff --git a/haxe/ui/components/NumberStepper.hx b/haxe/ui/components/NumberStepper.hx index 44d7120ee..3ec859502 100644 --- a/haxe/ui/components/NumberStepper.hx +++ b/haxe/ui/components/NumberStepper.hx @@ -155,7 +155,6 @@ private class Builder extends CompositeBuilder { var value = new TextField(); value.id = "value"; value.addClass("stepper-value"); - value.scriptAccess = false; value.allowFocus = false; value.restrictChars = "0-9\\-\\.\\,"; _stepper.addComponent(value); @@ -164,7 +163,6 @@ private class Builder extends CompositeBuilder { deinc.id = "deinc"; deinc.addClass("stepper-deinc"); deinc.allowFocus = false; - deinc.scriptAccess = false; deinc.repeater = true; _stepper.addComponent(deinc); @@ -172,7 +170,6 @@ private class Builder extends CompositeBuilder { inc.id = "inc"; inc.addClass("stepper-inc"); inc.allowFocus = false; - inc.scriptAccess = false; inc.repeater = true; _stepper.addComponent(inc); } diff --git a/haxe/ui/components/OptionStepper.hx b/haxe/ui/components/OptionStepper.hx index 64cbaa02a..a59ceea49 100644 --- a/haxe/ui/components/OptionStepper.hx +++ b/haxe/ui/components/OptionStepper.hx @@ -205,14 +205,12 @@ private class Builder extends CompositeBuilder { var value = new Label(); value.id = "value"; value.addClass("stepper-value"); - value.scriptAccess = false; _stepper.addComponent(value); var deinc = new Button(); deinc.id = "deinc"; deinc.addClass("stepper-deinc"); deinc.allowFocus = false; - deinc.scriptAccess = false; deinc.repeater = true; _stepper.addComponent(deinc); @@ -220,7 +218,6 @@ private class Builder extends CompositeBuilder { inc.id = "inc"; inc.addClass("stepper-inc"); inc.allowFocus = false; - inc.scriptAccess = false; inc.repeater = true; _stepper.addComponent(inc); } diff --git a/haxe/ui/components/Scroll.hx b/haxe/ui/components/Scroll.hx index 1994ef702..4848c0631 100644 --- a/haxe/ui/components/Scroll.hx +++ b/haxe/ui/components/Scroll.hx @@ -116,7 +116,6 @@ class Scroll extends InteractiveComponent implements IDirectionalComponent imple if (b == null) { b = new Button(); b.hidden = hidden; - b.scriptAccess = false; b.customStyle.native = false; b.id = 'scroll-${type}-button'; b.addClass(type); diff --git a/haxe/ui/components/SectionHeader.hx b/haxe/ui/components/SectionHeader.hx index cef6718f2..da314e184 100644 --- a/haxe/ui/components/SectionHeader.hx +++ b/haxe/ui/components/SectionHeader.hx @@ -39,12 +39,10 @@ private class Builder extends CompositeBuilder { var label = new Label(); label.text = "Section Header"; - label.scriptAccess = false; _component.addComponent(label); var line = new HorizontalRule(); line.addClasses(["section-line", "line"]); - line.scriptAccess = false; _component.addComponent(line); } diff --git a/haxe/ui/components/Slider.hx b/haxe/ui/components/Slider.hx index 520564d2b..419928690 100644 --- a/haxe/ui/components/Slider.hx +++ b/haxe/ui/components/Slider.hx @@ -355,7 +355,6 @@ private class MinorTicks extends DataBehaviour { for (_ in 0...addN) { var tick = new Component(); tick.addClass("minor-tick"); - tick.scriptAccess = false; slider.addComponent(tick); slider.setComponentIndex(tick, index + 1); } @@ -389,7 +388,6 @@ private class MajorTicks extends DataBehaviour { for (_ in 0...addN) { var tick = new Component(); tick.addClass("major-tick"); - tick.scriptAccess = false; slider.addComponent(tick); slider.setComponentIndex(tick, index + 1); } @@ -641,7 +639,6 @@ class SliderBuilder extends CompositeBuilder { if (_component.findComponent("range") == null) { var v = createValueComponent(); if (v != null) { - v.scriptAccess = false; v.allowFocus = false; v.id = "range"; v.addClass("slider-value"); @@ -671,7 +668,6 @@ class SliderBuilder extends CompositeBuilder { } var b = new Button(); - b.scriptAccess = false; b.allowFocus = false; b.id = id; b.addClass(id); diff --git a/haxe/ui/components/Switch.hx b/haxe/ui/components/Switch.hx index ec7e73cfc..2b56734e4 100644 --- a/haxe/ui/components/Switch.hx +++ b/haxe/ui/components/Switch.hx @@ -68,7 +68,6 @@ private class TextBehaviour extends DataBehaviour { label = new Label(); label.styleNames = "switch-label"; label.id = "switch-label"; - label.scriptAccess = false; _component.addComponentAt(label, 0); var spacer = new Spacer(); // TODO: ugly diff --git a/haxe/ui/components/TabBar.hx b/haxe/ui/components/TabBar.hx index 369929ebb..7133e4e05 100644 --- a/haxe/ui/components/TabBar.hx +++ b/haxe/ui/components/TabBar.hx @@ -430,7 +430,6 @@ private class Builder extends CompositeBuilder { _filler = new Box(); _filler.id = "tabbar-filler"; _filler.addClass("tabbar-filler"); - _filler.scriptAccess = false; _filler.includeInLayout = false; _tabbar.addComponent(_filler); } @@ -642,7 +641,6 @@ private class Builder extends CompositeBuilder { leftFiller = new Box(); leftFiller.id = "tabbar-filler-left"; leftFiller.addClass("tabbar-filler-left"); - leftFiller.scriptAccess = false; leftFiller.includeInLayout = false; _tabbar.addComponent(leftFiller); } @@ -658,7 +656,6 @@ private class Builder extends CompositeBuilder { rightFiller = new Box(); rightFiller.id = "tabbar-filler-right"; rightFiller.addClass("tabbar-filler-right"); - rightFiller.scriptAccess = false; rightFiller.includeInLayout = false; _tabbar.addComponent(rightFiller); } @@ -737,7 +734,6 @@ private class TabBarButton extends Button { image.id = "tab-close-button"; image.addClass("tab-close-button"); image.includeInLayout = false; - image.scriptAccess = false; image.onClick = onCloseClicked; addComponent(image); } else if (existing != null) { diff --git a/haxe/ui/components/TextArea.hx b/haxe/ui/components/TextArea.hx index fcaae6e97..856fcee46 100644 --- a/haxe/ui/components/TextArea.hx +++ b/haxe/ui/components/TextArea.hx @@ -315,7 +315,6 @@ private class IconBehaviour extends DataBehaviour { icon = new Image(); icon.id = "textarea-icon"; icon.addClass("icon"); - icon.scriptAccess = false; textarea.addComponentAt(icon, 0); } icon.resource = _value.toString(); @@ -603,7 +602,6 @@ private class TextAreaBuilder extends CompositeBuilder { hscroll.percentWidth = 100; hscroll.id = "textarea-hscroll"; hscroll.allowFocus = false; - hscroll.scriptAccess = false; _component.addComponent(hscroll); _component.registerInternalEvents(true); return hscroll; @@ -617,7 +615,6 @@ private class TextAreaBuilder extends CompositeBuilder { vscroll.percentHeight = 100; vscroll.id = "textarea-vscroll"; vscroll.allowFocus = false; - vscroll.scriptAccess = false; _component.addComponent(vscroll); _component.registerInternalEvents(true); return vscroll; diff --git a/haxe/ui/components/TextField.hx b/haxe/ui/components/TextField.hx index ab9f6b20a..035ba0136 100644 --- a/haxe/ui/components/TextField.hx +++ b/haxe/ui/components/TextField.hx @@ -283,7 +283,6 @@ private class IconBehaviour extends DataBehaviour { icon = new Image(); icon.id = "textfield-icon"; icon.addClass("icon"); - icon.scriptAccess = false; textfield.addComponentAt(icon, 0); } icon.resource = _value.toString(); diff --git a/haxe/ui/components/pickers/ItemPicker.hx b/haxe/ui/components/pickers/ItemPicker.hx index e389e610f..cc6df4bbb 100644 --- a/haxe/ui/components/pickers/ItemPicker.hx +++ b/haxe/ui/components/pickers/ItemPicker.hx @@ -101,7 +101,6 @@ private class DefaultItemPickerRenderer extends HBox { super(); addComponent(_renderer); - _triggerIcon.scriptAccess = false; _triggerIcon.id = "itemPickerTriggerIcon"; _triggerIcon.addClass("item-picker-trigger-icon"); addComponent(_triggerIcon); diff --git a/haxe/ui/containers/Accordion.hx b/haxe/ui/containers/Accordion.hx index addc08568..849acc10e 100644 --- a/haxe/ui/containers/Accordion.hx +++ b/haxe/ui/containers/Accordion.hx @@ -146,7 +146,6 @@ private class Builder extends CompositeBuilder { button.text = child.text; button.addClass("accordion-button"); button.toggle = true; - button.scriptAccess = false; if (child.id != null) { button.id = child.id + "Button"; } diff --git a/haxe/ui/containers/ButtonBar.hx b/haxe/ui/containers/ButtonBar.hx index c6537dbf0..fb7e2a545 100644 --- a/haxe/ui/containers/ButtonBar.hx +++ b/haxe/ui/containers/ButtonBar.hx @@ -153,7 +153,6 @@ class ButtonBarBuilder extends CompositeBuilder { if (_bar.numComponents > 0) { var divider = new Component(); divider.addClass("button-bar-divider"); - divider.scriptAccess = false; _bar.addComponent(divider); } diff --git a/haxe/ui/containers/Card.hx b/haxe/ui/containers/Card.hx index c00e566ad..b7392a007 100644 --- a/haxe/ui/containers/Card.hx +++ b/haxe/ui/containers/Card.hx @@ -2,8 +2,8 @@ package haxe.ui.containers; import haxe.ui.behaviours.DataBehaviour; import haxe.ui.components.Label; -import haxe.ui.containers.HBox; import haxe.ui.containers.Box; +import haxe.ui.containers.HBox; import haxe.ui.core.Component; import haxe.ui.core.CompositeBuilder; @@ -52,14 +52,12 @@ private class Builder extends CompositeBuilder { hbox = new HBox(); hbox.addClass("card-title-box"); hbox.id = "card-title-box"; - hbox.scriptAccess = false; titleContainer.addComponent(hbox); } titleLabel = new Label(); titleLabel.addClass("card-title-label"); titleLabel.id = "card-title-label"; - titleLabel.scriptAccess = false; hbox.addComponentAt(titleLabel, 0); var line = titleContainer.findComponent("card-title-line", Component); @@ -67,7 +65,6 @@ private class Builder extends CompositeBuilder { line = new Component(); line.id = "card-title-line"; line.addClass("card-title-line"); - line.scriptAccess = false; titleContainer.addComponent(line); } } @@ -81,7 +78,6 @@ private class Builder extends CompositeBuilder { titleContainer = new VBox(); titleContainer.addClass("card-title-container"); titleContainer.id = "card-title-container"; - titleContainer.scriptAccess = false; _card.addComponentAt(titleContainer, 0); } diff --git a/haxe/ui/containers/Collapsible.hx b/haxe/ui/containers/Collapsible.hx index 6e66f764b..1a73c2b01 100644 --- a/haxe/ui/containers/Collapsible.hx +++ b/haxe/ui/containers/Collapsible.hx @@ -176,7 +176,6 @@ class CollapsibleBuilder extends CompositeBuilder { _content = new VBox(); _content.addClass("collapsible-content"); _content.id = "collapsible-content"; - _content.scriptAccess = false; _content.hide(); _collapsible.addComponent(_content); diff --git a/haxe/ui/containers/Frame.hx b/haxe/ui/containers/Frame.hx index 6e295cf9e..6e4e046be 100644 --- a/haxe/ui/containers/Frame.hx +++ b/haxe/ui/containers/Frame.hx @@ -37,7 +37,6 @@ private class IconBehaviour extends DataBehaviour { icon = new Image(); icon.addClass("frame-icon"); icon.id = "frame-icon"; - icon.scriptAccess = false; icon.includeInLayout = false; _component.addComponent(icon); } @@ -123,13 +122,11 @@ private class Builder extends CompositeBuilder { _border.id = "frame-border"; _border.addClass("frame-border"); _border.includeInLayout = false; - _border.scriptAccess = false; _frame.addComponent(_border); _contents = new Box(); _contents.id = "frame-contents"; _contents.addClass("frame-contents"); - _contents.scriptAccess = false; _frame.addComponent(_contents); _label = new Label(); @@ -137,21 +134,18 @@ private class Builder extends CompositeBuilder { _label.id = "frame-title"; _label.addClass("frame-title"); _label.includeInLayout = false; - _label.scriptAccess = false; _frame.addComponent(_label); var line = new Component(); line.id = "frame-left-line"; line.addClass("frame-left-line"); line.includeInLayout = false; - _label.scriptAccess = false; _frame.addComponent(line); var line = new Component(); line.id = "frame-right-line"; line.addClass("frame-right-line"); line.includeInLayout = false; - _label.scriptAccess = false; _frame.addComponent(line); } diff --git a/haxe/ui/containers/ScrollView.hx b/haxe/ui/containers/ScrollView.hx index 210fe7441..4bd0150ab 100644 --- a/haxe/ui/containers/ScrollView.hx +++ b/haxe/ui/containers/ScrollView.hx @@ -1579,7 +1579,6 @@ class ScrollViewBuilder extends CompositeBuilder { if (vcw > usableSize.width && hscroll == null || _scrollview.horizontalScrollPolicy == ScrollPolicy.ALWAYS) { hscroll = new HorizontalScroll(); - hscroll.scriptAccess = false; hscroll.includeInLayout = !_scrollview.autoHideScrolls; hscroll.hidden = _scrollview.autoHideScrolls; hscroll.percentWidth = 100; @@ -1620,7 +1619,6 @@ class ScrollViewBuilder extends CompositeBuilder { if ((vch > usableSize.height && vscroll == null) || _scrollview.verticalScrollPolicy == ScrollPolicy.ALWAYS) { vscroll = new VerticalScroll(); - vscroll.scriptAccess = false; vscroll.includeInLayout = !_scrollview.autoHideScrolls; vscroll.hidden = _scrollview.autoHideScrolls; vscroll.percentHeight = 100; diff --git a/haxe/ui/containers/TreeViewNode.hx b/haxe/ui/containers/TreeViewNode.hx index dfddf1de1..a8f78c2f7 100644 --- a/haxe/ui/containers/TreeViewNode.hx +++ b/haxe/ui/containers/TreeViewNode.hx @@ -318,7 +318,6 @@ private class TreeViewNodeBuilder extends CompositeBuilder { _nodeContainer = new HBox(); _nodeContainer.addClass("treenode-container"); _expandCollapseIcon = new Image(); - _expandCollapseIcon.scriptAccess = false; _expandCollapseIcon.addClass("treenode-expand-collapse-icon"); _expandCollapseIcon.id = "treenode-expand-collapse-icon"; _expandCollapseIcon.registerEvent(MouseEvent.CLICK, onExpandCollapseClicked); diff --git a/haxe/ui/containers/dialogs/CollapsibleDialog.hx b/haxe/ui/containers/dialogs/CollapsibleDialog.hx index a9f5cba01..d1771b1de 100644 --- a/haxe/ui/containers/dialogs/CollapsibleDialog.hx +++ b/haxe/ui/containers/dialogs/CollapsibleDialog.hx @@ -73,7 +73,6 @@ private class Builder extends CompositeBuilder { _dialogMinMaxButton = new Image(); _dialogMinMaxButton.id = "dialog-minmax-button"; _dialogMinMaxButton.styleNames = "dialog-minimize-button"; - _dialogMinMaxButton.scriptAccess = false; _dialogMinMaxButton.registerEvent(MouseEvent.CLICK, onMinMaxButton); dialogTitle.addComponent(_dialogMinMaxButton); diff --git a/haxe/ui/containers/menus/MenuCheckBox.hx b/haxe/ui/containers/menus/MenuCheckBox.hx index 5586d5df8..d2c7dadeb 100644 --- a/haxe/ui/containers/menus/MenuCheckBox.hx +++ b/haxe/ui/containers/menus/MenuCheckBox.hx @@ -26,7 +26,6 @@ private class TextBehaviour extends DataBehaviour { if (checkbox == null) { checkbox = new CheckBox(); checkbox.styleNames = "menuitem-checkbox"; - checkbox.scriptAccess = false; _component.addComponent(checkbox); } @@ -51,7 +50,6 @@ private class SelectedBehaviour extends DataBehaviour { if (checkbox == null) { checkbox = new CheckBox(); checkbox.styleNames = "menuitem-checkbox"; - checkbox.scriptAccess = false; _component.addComponent(checkbox); } @@ -85,13 +83,11 @@ private class Builder extends CompositeBuilder { _checkbox.styleNames = "menuitem-checkbox"; _checkbox.percentWidth = 100; _checkbox.registerEvent(UIEvent.CHANGE, onCheckboxChange); - _checkbox.scriptAccess = false; _component.addComponent(_checkbox); var label = new Label(); label.id = "menuitem-shortcut-label"; label.styleNames = "menuitem-shortcut-label"; - label.scriptAccess = false; _component.addComponent(label); } diff --git a/haxe/ui/containers/menus/MenuItem.hx b/haxe/ui/containers/menus/MenuItem.hx index 3b2b69506..50bc39f8a 100644 --- a/haxe/ui/containers/menus/MenuItem.hx +++ b/haxe/ui/containers/menus/MenuItem.hx @@ -49,7 +49,6 @@ private class IconBehaviour extends DataBehaviour { var icon:Image = _component.findComponent("menuitem-icon", true); if (icon == null) { icon = new Image(); - icon.scriptAccess = false; icon.id = "menuitem-icon"; icon.addClass("menuitem-icon"); icon.addClass("icon"); @@ -67,7 +66,6 @@ private class ExpandableBehaviour extends DataBehaviour { image = new Image(); image.id = "menuitem-expandable"; image.styleNames = "menuitem-expandable"; - image.scriptAccess = false; _component.addComponent(image); _component.invalidateComponentStyle(true); } else if (_value == false) { @@ -122,13 +120,11 @@ private class Builder extends CompositeBuilder { label.id = "menuitem-label"; //label.percentWidth = 100; label.styleNames = "menuitem-label"; - label.scriptAccess = false; box.addComponent(label); var label = new Label(); label.id = "menuitem-shortcut-label"; label.styleNames = "menuitem-shortcut-label"; - label.scriptAccess = false; box.addComponent(label); _component.addComponent(box); diff --git a/haxe/ui/containers/menus/MenuOptionBox.hx b/haxe/ui/containers/menus/MenuOptionBox.hx index a31f77634..6d4f5a721 100644 --- a/haxe/ui/containers/menus/MenuOptionBox.hx +++ b/haxe/ui/containers/menus/MenuOptionBox.hx @@ -29,7 +29,6 @@ private class GroupBehaviour extends DataBehaviour { if (optionbox == null) { optionbox = new OptionBox(); optionbox.styleNames = "menuitem-optionbox"; - optionbox.scriptAccess = false; _component.addComponent(optionbox); } @@ -54,7 +53,6 @@ private class TextBehaviour extends DataBehaviour { if (optionbox == null) { optionbox = new OptionBox(); optionbox.styleNames = "menuitem-optionbox"; - optionbox.scriptAccess = false; _component.addComponent(optionbox); } @@ -69,7 +67,6 @@ private class SelectedBehaviour extends DataBehaviour { if (optionbox == null) { optionbox = new OptionBox(); optionbox.styleNames = "menuitem-optionbox"; - optionbox.scriptAccess = false; _component.addComponent(optionbox); } @@ -115,13 +112,11 @@ private class Builder extends CompositeBuilder { _optionbox.styleNames = "menuitem-optionbox"; _optionbox.percentWidth = 100; _optionbox.registerEvent(UIEvent.CHANGE, onOptionboxChange); - _optionbox.scriptAccess = false; _component.addComponent(_optionbox); var label = new Label(); label.id = "menuitem-shortcut-label"; label.styleNames = "menuitem-shortcut-label"; - label.scriptAccess = false; _component.addComponent(label); } diff --git a/haxe/ui/containers/menus/MenuSeparator.hx b/haxe/ui/containers/menus/MenuSeparator.hx index eeef51c97..4d8bb9e57 100644 --- a/haxe/ui/containers/menus/MenuSeparator.hx +++ b/haxe/ui/containers/menus/MenuSeparator.hx @@ -17,7 +17,6 @@ private class Builder extends CompositeBuilder { public override function create() { super.create(); var line = new Component(); - line.scriptAccess = false; line.addClass("menuseparator-line"); _component.addComponent(line); } diff --git a/haxe/ui/containers/properties/PropertyGroup_OLD.hx b/haxe/ui/containers/properties/PropertyGroup_OLD.hx index 9da8c4183..e1e84027e 100644 --- a/haxe/ui/containers/properties/PropertyGroup_OLD.hx +++ b/haxe/ui/containers/properties/PropertyGroup_OLD.hx @@ -141,26 +141,22 @@ private class Builder extends CompositeBuilder { public override function create() { _propertyGroupHeader = new HBox(); - _propertyGroupHeader.scriptAccess = false; _propertyGroupHeader.addClass("property-group-header_o-l-d"); _propertyGroupHeader.addClass(":expanded"); _propertyGroupHeader.id = "property-group-header"; var image = new Image(); image.addClass("property-group-header-icon_o-l-d"); - image.scriptAccess = false; _propertyGroupHeader.addComponent(image); var label = new Label(); label.addClass("property-group-header-label_o-l-d"); label.id = "property-group-header-label"; - label.scriptAccess = false; _propertyGroupHeader.addComponent(label); _propertyGroup.addComponent(_propertyGroupHeader); _propertyGroupContents = new Grid(); - _propertyGroupContents.scriptAccess = false; _propertyGroupContents.addClass("property-group-contents_o-l-d"); _propertyGroupContents.id = "property-group-contents"; _propertyGroup.addComponent(_propertyGroupContents); @@ -171,12 +167,10 @@ private class Builder extends CompositeBuilder { var prop = cast(child, Property_OLD); var labelContainer = new Box(); - labelContainer.scriptAccess = false; labelContainer.addClass("property-group-item-label-container_o-l-d"); _propertyGroupContents.addComponent(labelContainer); var label = new Label(); - label.scriptAccess = false; label.text = prop.label; label.addClass("property-group-item-label_o-l-d"); labelContainer.addComponent(label); @@ -187,14 +181,12 @@ private class Builder extends CompositeBuilder { cast(prop._compositeBuilder, PropertyBuilder).label = label; var editorContainer = new Box(); - editorContainer.scriptAccess = false; editorContainer.addClass("property-group-item-editor-container_o-l-d"); _propertyGroupContents.addComponent(editorContainer); var editor = buildEditor(prop); editor.disabled = prop.disabled; - editor.scriptAccess = false; editor.id = child.id; editor.addClass("property-group-item-editor_o-l-d"); editorContainer.addComponent(editor); diff --git a/haxe/ui/containers/windows/WindowList.hx b/haxe/ui/containers/windows/WindowList.hx index ce2e9b30c..d91334abe 100644 --- a/haxe/ui/containers/windows/WindowList.hx +++ b/haxe/ui/containers/windows/WindowList.hx @@ -1,11 +1,11 @@ package haxe.ui.containers.windows; +import haxe.ui.behaviours.DataBehaviour; +import haxe.ui.components.Button; +import haxe.ui.components.Image; +import haxe.ui.core.Component; import haxe.ui.events.MouseEvent; import haxe.ui.geom.Size; -import haxe.ui.core.Component; -import haxe.ui.components.Image; -import haxe.ui.components.Button; -import haxe.ui.behaviours.DataBehaviour; @:xml(' @@ -82,7 +82,6 @@ private class WindowListItem extends Button { image.id = "window-list-close-button"; image.addClass("window-list-close-button"); image.includeInLayout = false; - image.scriptAccess = false; image.onClick = onCloseClicked; image.registerEvent(MouseEvent.MOUSE_DOWN, function(event:MouseEvent) { event.cancel(); diff --git a/haxe/ui/core/Component.hx b/haxe/ui/core/Component.hx index 628fc59f4..c8f3dba4d 100644 --- a/haxe/ui/core/Component.hx +++ b/haxe/ui/core/Component.hx @@ -340,7 +340,6 @@ class Component extends ComponentImpl if (_compositeBuilder != null) { var v = _compositeBuilder.addComponent(child); if (v != null) { - v.scriptAccess = this.scriptAccess; return v; } } @@ -381,7 +380,6 @@ class Component extends ComponentImpl dispatch(event); child.dispatch(new UIEvent(UIEvent.COMPONENT_ADDED_TO_PARENT)); - child.scriptAccess = this.scriptAccess; return child; } @@ -422,7 +420,6 @@ class Component extends ComponentImpl if (_compositeBuilder != null) { var v = _compositeBuilder.addComponentAt(child, index); if (v != null) { - v.scriptAccess = this.scriptAccess; return v; } } @@ -461,7 +458,6 @@ class Component extends ComponentImpl dispatch(new UIEvent(UIEvent.COMPONENT_ADDED)); child.dispatch(new UIEvent(UIEvent.COMPONENT_ADDED_TO_PARENT)); - child.scriptAccess = this.scriptAccess; return child; } @@ -1776,30 +1772,7 @@ class Component extends ComponentImpl //*********************************************************************************************************** // Script related //*********************************************************************************************************** - - @:noCompletion private var _scriptAccess:Bool = true; - @:dox(group = "Script related properties and methods") - /** - * Whether or not this component is allowed to be exposed to script interpreters (defaults to `true`) - */ - public var scriptAccess(get, set):Bool; - private function get_scriptAccess():Bool { - return _scriptAccess; - } - private function set_scriptAccess(value:Bool):Bool { - if (value == _scriptAccess) { - return value; - } - - _scriptAccess = value; - for (child in childComponents) { - child.scriptAccess = value; - } - - return value; - } - @:dox(group = "Script related properties and methods") public var namedComponents(get, null):Array; private function get_namedComponents():Array { diff --git a/haxe/ui/locale/LocaleManager.hx b/haxe/ui/locale/LocaleManager.hx index 23b109337..dec3f5e6e 100644 --- a/haxe/ui/locale/LocaleManager.hx +++ b/haxe/ui/locale/LocaleManager.hx @@ -133,9 +133,6 @@ class LocaleManager { var root = findRoot(component); for (k in root.namedComponents) { - if (k.scriptAccess == false) { - continue; - } Reflect.setField(context, k.id, k); }