From 22e7894c039dd7b4bc05502200f4ca6b03c1e1a0 Mon Sep 17 00:00:00 2001 From: shmyga Date: Mon, 25 Mar 2019 16:24:57 +0300 Subject: [PATCH] [view] rename from gui --- demo/src/demo/Demo.hx | 10 ++++---- demo/src/demo/DemoView.yaml | 24 +++++++++---------- demo/src/demo/Theme.hx | 4 ++-- demo/src/demo/form/DataForm.hx | 4 ++-- demo/src/demo/form/DataForm.yaml | 8 +++---- demo/src/demo/form/ListForm.hx | 8 +++---- demo/src/demo/form/ListForm.yaml | 4 ++-- demo/src/demo/form/TailForm.hx | 10 ++++---- demo/src/demo/form/TailForm.yaml | 8 +++---- demo/src/demo/popup/ColorPopup.hx | 6 ++--- demo/src/demo/popup/ColorPopup.yaml | 10 ++++---- haxelib.json | 6 ++--- src/main/haxework/App.hx | 6 ++--- .../haxework/animate/CircleMaskAnimate.hx | 2 +- src/main/haxework/animate/FadeAnimate.hx | 2 +- src/main/haxework/animate/SlideAnimate.hx | 2 +- src/main/haxework/animate/UnFadeAnimate.hx | 2 +- src/main/haxework/resources/IResources.hx | 2 +- src/main/haxework/resources/Resources.hx | 2 +- src/main/haxework/{gui => view}/ButtonView.hx | 2 +- src/main/haxework/{gui => view}/DataView.hx | 2 +- src/main/haxework/{gui => view}/GroupView.hx | 6 ++--- src/main/haxework/{gui => view}/HGroupView.hx | 4 ++-- src/main/haxework/{gui => view}/IGroupView.hx | 4 ++-- src/main/haxework/{gui => view}/ITextView.hx | 4 ++-- src/main/haxework/{gui => view}/IView.hx | 6 ++--- src/main/haxework/{gui => view}/ImageView.hx | 10 ++++---- .../haxework/{gui => view}/InputTextField.hx | 4 ++-- src/main/haxework/{gui => view}/InputView.hx | 2 +- src/main/haxework/{gui => view}/LabelView.hx | 6 ++--- src/main/haxework/{gui => view}/MovieView.hx | 2 +- .../haxework/{gui => view}/ProgressView.hx | 4 ++-- src/main/haxework/{gui => view}/Root.hx | 2 +- src/main/haxework/{gui => view}/ScrollView.hx | 8 +++---- src/main/haxework/{gui => view}/SpriteView.hx | 2 +- src/main/haxework/{gui => view}/TextView.hx | 10 ++++---- .../{gui => view}/ToggleButtonView.hx | 2 +- src/main/haxework/{gui => view}/VGroupView.hx | 4 ++-- src/main/haxework/{gui => view}/View.hx | 8 +++---- .../haxework/{gui => view}/ViewUpdater.hx | 2 +- src/main/haxework/{gui => view}/core/Box.hx | 2 +- .../haxework/{gui => view}/core/Geometry.hx | 2 +- .../haxework/{gui => view}/core/HAlign.hx | 2 +- src/main/haxework/{gui => view}/core/Size.hx | 2 +- .../haxework/{gui => view}/core/VAlign.hx | 2 +- .../{gui => view}/frame/FrameSwitcher.hx | 6 ++--- .../{gui => view}/layout/DefaultLayout.hx | 8 +++---- .../{gui => view}/layout/HorizontalLayout.hx | 6 ++--- .../haxework/{gui => view}/layout/ILayout.hx | 6 ++--- .../haxework/{gui => view}/layout/Layout.hx | 6 ++--- .../{gui => view}/layout/TailLayout.hx | 4 ++-- .../{gui => view}/layout/VerticalLayout.hx | 6 ++--- .../haxework/{gui => view}/list/HListView.hx | 14 +++++------ .../{gui => view}/list/HScrollBarView.hx | 2 +- .../{gui => view}/list/LabelListItem.hx | 6 ++--- .../haxework/{gui => view}/list/ListView.hx | 12 +++++----- .../{gui => view}/list/ScrollBarView.hx | 2 +- .../haxework/{gui => view}/list/VListView.hx | 14 +++++------ .../{gui => view}/list/VScrollBarView.hx | 2 +- .../{gui => view}/popup/PopupManager.hx | 6 ++--- .../haxework/{gui => view}/popup/PopupView.hx | 8 +++---- .../haxework/{gui => view}/skin/BitmapSkin.hx | 6 ++--- .../haxework/{gui => view}/skin/BorderSkin.hx | 2 +- .../{gui => view}/skin/ButtonBitmapSkin.hx | 10 ++++---- .../{gui => view}/skin/ButtonColorSkin.hx | 4 ++-- .../haxework/{gui => view}/skin/ColorSkin.hx | 2 +- .../{gui => view}/skin/GeometrySkin.hx | 8 +++---- .../{gui => view}/skin/HScrollBarSkin.hx | 4 ++-- src/main/haxework/{gui => view}/skin/ISkin.hx | 2 +- .../haxework/{gui => view}/skin/LayoutSkin.hx | 8 +++---- .../{gui => view}/skin/ProgressSkin.hx | 4 ++-- src/main/haxework/{gui => view}/skin/Skin.hx | 7 +++--- .../{gui => view}/skin/TabColorSkin.hx | 2 +- .../haxework/{gui => view}/skin/TextSkin.hx | 4 ++-- .../{gui => view}/skin/VScrollBarSkin.hx | 4 ++-- .../{gui => view}/utils/BitmapUtil.hx | 2 +- .../haxework/{gui => view}/utils/DrawUtil.hx | 4 ++-- 77 files changed, 202 insertions(+), 203 deletions(-) rename src/main/haxework/{gui => view}/ButtonView.hx (99%) rename src/main/haxework/{gui => view}/DataView.hx (98%) rename src/main/haxework/{gui => view}/GroupView.hx (96%) rename src/main/haxework/{gui => view}/HGroupView.hx (60%) rename src/main/haxework/{gui => view}/IGroupView.hx (90%) rename src/main/haxework/{gui => view}/ITextView.hx (90%) rename src/main/haxework/{gui => view}/IView.hx (90%) rename src/main/haxework/{gui => view}/ImageView.hx (91%) rename src/main/haxework/{gui => view}/InputTextField.hx (98%) rename src/main/haxework/{gui => view}/InputView.hx (99%) rename src/main/haxework/{gui => view}/LabelView.hx (76%) rename src/main/haxework/{gui => view}/MovieView.hx (98%) rename src/main/haxework/{gui => view}/ProgressView.hx (95%) rename src/main/haxework/{gui => view}/Root.hx (99%) rename src/main/haxework/{gui => view}/ScrollView.hx (94%) rename src/main/haxework/{gui => view}/SpriteView.hx (94%) rename src/main/haxework/{gui => view}/TextView.hx (97%) rename src/main/haxework/{gui => view}/ToggleButtonView.hx (96%) rename src/main/haxework/{gui => view}/VGroupView.hx (61%) rename src/main/haxework/{gui => view}/View.hx (96%) rename src/main/haxework/{gui => view}/ViewUpdater.hx (98%) rename src/main/haxework/{gui => view}/core/Box.hx (98%) rename src/main/haxework/{gui => view}/core/Geometry.hx (99%) rename src/main/haxework/{gui => view}/core/HAlign.hx (84%) rename src/main/haxework/{gui => view}/core/Size.hx (97%) rename src/main/haxework/{gui => view}/core/VAlign.hx (84%) rename src/main/haxework/{gui => view}/frame/FrameSwitcher.hx (96%) rename src/main/haxework/{gui => view}/layout/DefaultLayout.hx (95%) rename src/main/haxework/{gui => view}/layout/HorizontalLayout.hx (94%) rename src/main/haxework/{gui => view}/layout/ILayout.hx (79%) rename src/main/haxework/{gui => view}/layout/Layout.hx (86%) rename src/main/haxework/{gui => view}/layout/TailLayout.hx (97%) rename src/main/haxework/{gui => view}/layout/VerticalLayout.hx (94%) rename src/main/haxework/{gui => view}/list/HListView.hx (78%) rename src/main/haxework/{gui => view}/list/HScrollBarView.hx (94%) rename src/main/haxework/{gui => view}/list/LabelListItem.hx (88%) rename src/main/haxework/{gui => view}/list/ListView.hx (97%) rename src/main/haxework/{gui => view}/list/ScrollBarView.hx (98%) rename src/main/haxework/{gui => view}/list/VListView.hx (78%) rename src/main/haxework/{gui => view}/list/VScrollBarView.hx (94%) rename src/main/haxework/{gui => view}/popup/PopupManager.hx (92%) rename src/main/haxework/{gui => view}/popup/PopupView.hx (85%) rename src/main/haxework/{gui => view}/skin/BitmapSkin.hx (90%) rename src/main/haxework/{gui => view}/skin/BorderSkin.hx (95%) rename src/main/haxework/{gui => view}/skin/ButtonBitmapSkin.hx (91%) rename src/main/haxework/{gui => view}/skin/ButtonColorSkin.hx (95%) rename src/main/haxework/{gui => view}/skin/ColorSkin.hx (94%) rename src/main/haxework/{gui => view}/skin/GeometrySkin.hx (92%) rename src/main/haxework/{gui => view}/skin/HScrollBarSkin.hx (93%) rename src/main/haxework/{gui => view}/skin/ISkin.hx (89%) rename src/main/haxework/{gui => view}/skin/LayoutSkin.hx (85%) rename src/main/haxework/{gui => view}/skin/ProgressSkin.hx (92%) rename src/main/haxework/{gui => view}/skin/Skin.hx (93%) rename src/main/haxework/{gui => view}/skin/TabColorSkin.hx (95%) rename src/main/haxework/{gui => view}/skin/TextSkin.hx (91%) rename src/main/haxework/{gui => view}/skin/VScrollBarSkin.hx (93%) rename src/main/haxework/{gui => view}/utils/BitmapUtil.hx (98%) rename src/main/haxework/{gui => view}/utils/DrawUtil.hx (99%) diff --git a/demo/src/demo/Demo.hx b/demo/src/demo/Demo.hx index 448b06e..acdf82c 100644 --- a/demo/src/demo/Demo.hx +++ b/demo/src/demo/Demo.hx @@ -3,11 +3,11 @@ package demo; import haxework.net.JsonLoader; import demo.popup.ColorPopup; import haxework.App; -import haxework.gui.frame.FrameSwitcher; -import haxework.gui.IGroupView; -import haxework.gui.IView; -import haxework.gui.ToggleButtonView; -import haxework.gui.VGroupView; +import haxework.view.frame.FrameSwitcher; +import haxework.view.IGroupView; +import haxework.view.IView; +import haxework.view.ToggleButtonView; +import haxework.view.VGroupView; import haxework.log.TraceLogger; @:template class DemoView extends VGroupView { diff --git a/demo/src/demo/DemoView.yaml b/demo/src/demo/DemoView.yaml index a555714..f568578 100644 --- a/demo/src/demo/DemoView.yaml +++ b/demo/src/demo/DemoView.yaml @@ -2,11 +2,11 @@ skinId: background geometry.size.stretch: true views: - - $type: haxework.gui.ImageView + - $type: haxework.view.ImageView geometry.padding: 10 image: $r:image:logo - id: tabs - $type: haxework.gui.HGroupView + $type: haxework.view.HGroupView layout.margin: 5 layout.hAlign: left geometry.size.width: 100% @@ -14,25 +14,25 @@ views: geometry.margin.bottom: -3 views: - id: list_form - $type: haxework.gui.ToggleButtonView + $type: haxework.view.ToggleButtonView skinId: tab geometry.padding: [25, 8] text: List +onPress: "$code:switcher.change('list_form')" - id: tail_form - $type: haxework.gui.ToggleButtonView + $type: haxework.view.ToggleButtonView skinId: tab geometry.padding: [25, 8] text: Tail +onPress: "$code:switcher.change('tail_form')" - id: data_form - $type: haxework.gui.ToggleButtonView + $type: haxework.view.ToggleButtonView skinId: tab geometry.padding: [25, 8] text: Data +onPress: "$code:switcher.change('data_form')" - id: switcher - $type: haxework.gui.frame.FrameSwitcher + $type: haxework.view.frame.FrameSwitcher skinId: panel animateFactory: { $class: haxework.animate.SlideAnimate } +onSwitch: $this:onFrameSwitch @@ -51,28 +51,28 @@ views: $type: demo.form.DataForm skinId: background geometry.size.stretch: true - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView geometry.size.percent.width: 100 geometry.padding: 10 layout.margin: 10 views: - - $type: haxework.gui.ButtonView + - $type: haxework.view.ButtonView geometry.padding: [25, 8] skinId: button text: Color +onPress: "$code:choiceColor()" # separator - - $type: haxework.gui.SpriteView + - $type: haxework.view.SpriteView geometry.size.stretch: true - - $type: haxework.gui.ButtonView + - $type: haxework.view.ButtonView geometry.padding: [25, 8] skinId: button text: OK - - $type: haxework.gui.ButtonView + - $type: haxework.view.ButtonView geometry.padding: [25, 8] skinId: button text: Apply - - $type: haxework.gui.ButtonView + - $type: haxework.view.ButtonView geometry.padding: [25, 8] skinId: button text: Cancel diff --git a/demo/src/demo/Theme.hx b/demo/src/demo/Theme.hx index 9bc205a..eebd819 100644 --- a/demo/src/demo/Theme.hx +++ b/demo/src/demo/Theme.hx @@ -2,8 +2,8 @@ package demo; import haxework.color.ColorUtil; import haxework.resources.IResources; -import haxework.gui.skin.Skin; -import haxework.gui.skin.TextSkin; +import haxework.view.skin.Skin; +import haxework.view.skin.TextSkin; class Theme { diff --git a/demo/src/demo/form/DataForm.hx b/demo/src/demo/form/DataForm.hx index 2093d75..90f43e4 100644 --- a/demo/src/demo/form/DataForm.hx +++ b/demo/src/demo/form/DataForm.hx @@ -1,7 +1,7 @@ package demo.form; -import haxework.gui.TextView; -import haxework.gui.VGroupView; +import haxework.view.TextView; +import haxework.view.VGroupView; @:template class DataForm extends VGroupView { diff --git a/demo/src/demo/form/DataForm.yaml b/demo/src/demo/form/DataForm.yaml index 75c9c84..06f3f5c 100644 --- a/demo/src/demo/form/DataForm.yaml +++ b/demo/src/demo/form/DataForm.yaml @@ -1,15 +1,15 @@ --- views: - - $type: haxework.gui.ScrollView + - $type: haxework.view.ScrollView geometry.size.stretch: true view: id: data - $type: haxework.gui.DataView + $type: haxework.view.DataView layout: - $type: haxework.gui.layout.VerticalLayout + $type: haxework.view.layout.VerticalLayout factory: $this:factory geometry.size.width: 100% data: $r:any:data scroll: - $type: haxework.gui.list.VScrollBarView + $type: haxework.view.list.VScrollBarView skinId: scroll diff --git a/demo/src/demo/form/ListForm.hx b/demo/src/demo/form/ListForm.hx index bfdf68c..63ab973 100644 --- a/demo/src/demo/form/ListForm.hx +++ b/demo/src/demo/form/ListForm.hx @@ -1,9 +1,9 @@ package demo.form; -import haxework.gui.list.LabelListItem; -import haxework.gui.list.ListView.IListItemView; -import haxework.gui.list.VListView; -import haxework.gui.VGroupView; +import haxework.view.list.LabelListItem; +import haxework.view.list.ListView.IListItemView; +import haxework.view.list.VListView; +import haxework.view.VGroupView; @:template class ListForm extends VGroupView { @:view public var list(default, null):VListView; diff --git a/demo/src/demo/form/ListForm.yaml b/demo/src/demo/form/ListForm.yaml index 8988fec..da26823 100644 --- a/demo/src/demo/form/ListForm.yaml +++ b/demo/src/demo/form/ListForm.yaml @@ -1,11 +1,11 @@ --- views: - id: list - $type: haxework.gui.list.VListView + $type: haxework.view.list.VListView +onItemSelect: $this:onItemSelect factory: $this:factory geometry.size.stretch: true scroll: - $type: haxework.gui.list.VScrollBarView + $type: haxework.view.list.VScrollBarView skinId: scroll data: $r:any:data50 diff --git a/demo/src/demo/form/TailForm.hx b/demo/src/demo/form/TailForm.hx index 8723779..f375782 100644 --- a/demo/src/demo/form/TailForm.hx +++ b/demo/src/demo/form/TailForm.hx @@ -1,10 +1,10 @@ package demo.form; -import haxework.gui.HGroupView; -import haxework.gui.ImageView; -import haxework.gui.IView; -import haxework.gui.TextView; -import haxework.gui.utils.DrawUtil.FillType; +import haxework.view.HGroupView; +import haxework.view.ImageView; +import haxework.view.IView; +import haxework.view.TextView; +import haxework.view.utils.DrawUtil.FillType; @:template class TailForm extends HGroupView { diff --git a/demo/src/demo/form/TailForm.yaml b/demo/src/demo/form/TailForm.yaml index 58cc068..889ed80 100644 --- a/demo/src/demo/form/TailForm.yaml +++ b/demo/src/demo/form/TailForm.yaml @@ -1,16 +1,16 @@ --- views: - - $type: haxework.gui.ScrollView + - $type: haxework.view.ScrollView geometry.size.stretch: true view: id: data - $type: haxework.gui.DataView + $type: haxework.view.DataView layout: - $type: haxework.gui.layout.TailLayout + $type: haxework.view.layout.TailLayout margin: 2 factory: $this:factory geometry.size.width: 100% data: $r:any:data scroll: - $type: haxework.gui.list.VScrollBarView + $type: haxework.view.list.VScrollBarView skinId: scroll diff --git a/demo/src/demo/popup/ColorPopup.hx b/demo/src/demo/popup/ColorPopup.hx index f8fef69..3320c11 100644 --- a/demo/src/demo/popup/ColorPopup.hx +++ b/demo/src/demo/popup/ColorPopup.hx @@ -1,8 +1,8 @@ package demo.popup; -import haxework.gui.ButtonView; -import haxework.gui.popup.PopupView; -import haxework.gui.skin.Skin; +import haxework.view.ButtonView; +import haxework.view.popup.PopupView; +import haxework.view.skin.Skin; @:template class ColorPopup extends PopupView { diff --git a/demo/src/demo/popup/ColorPopup.yaml b/demo/src/demo/popup/ColorPopup.yaml index 97a416e..9b5c787 100644 --- a/demo/src/demo/popup/ColorPopup.yaml +++ b/demo/src/demo/popup/ColorPopup.yaml @@ -1,6 +1,6 @@ --- view: - $type: haxework.gui.VGroupView + $type: haxework.view.VGroupView geometry.size.width: 400 geometry.size.height: 200 geometry.padding: 10 @@ -9,10 +9,10 @@ view: skinId: panel views: - id: colors - $type: haxework.gui.DataView + $type: haxework.view.DataView geometry.size.stretch: true layout: - $type: haxework.gui.layout.TailLayout + $type: haxework.view.layout.TailLayout vAlign: middle margin: 5 factory: $this:colorViewFactory @@ -23,12 +23,12 @@ view: - 0xCC33AA - 0x3333AA +onDataSelect: $this:close - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView geometry.size.width: 100% layout.hAlign: right layout.margin: 10 views: - - $type: haxework.gui.ButtonView + - $type: haxework.view.ButtonView geometry.padding: [25, 8] skinId: button text: Cancel diff --git a/haxelib.json b/haxelib.json index 37c3c18..fb15405 100755 --- a/haxelib.json +++ b/haxelib.json @@ -3,12 +3,12 @@ "url": "https://bitbucket.org/shmyga/haxework", "license": "MIT", "tags": [ - "gui", + "view", "layout", "template" ], - "description": "Framework.", - "version": "0.9.0", + "description": "View framework.", + "version": "1.0.0", "releasenote": "Update.", "contributors": [ "shmyga" diff --git a/src/main/haxework/App.hx b/src/main/haxework/App.hx index af5460c..0ecc747 100644 --- a/src/main/haxework/App.hx +++ b/src/main/haxework/App.hx @@ -1,12 +1,12 @@ package haxework; -import haxework.gui.Root; -import haxework.gui.IView; +import haxework.view.Root; +import haxework.view.IView; import flash.Lib; import haxework.animate.Animate; import haxework.animate.FadeAnimate; import haxework.animate.UnFadeAnimate; -import haxework.gui.popup.PopupManager; +import haxework.view.popup.PopupManager; import haxework.net.manage.ILoaderManager; import haxework.net.manage.LoaderManager; import haxework.resources.IResources; diff --git a/src/main/haxework/animate/CircleMaskAnimate.hx b/src/main/haxework/animate/CircleMaskAnimate.hx index b5737b3..b4a2338 100755 --- a/src/main/haxework/animate/CircleMaskAnimate.hx +++ b/src/main/haxework/animate/CircleMaskAnimate.hx @@ -4,7 +4,7 @@ import flash.display.DisplayObject; import flash.display.Sprite; import haxework.animate.Animate; import haxework.animate.IAnimate; -import haxework.gui.IView; +import haxework.view.IView; class CircleMaskAnimate extends Animate { diff --git a/src/main/haxework/animate/FadeAnimate.hx b/src/main/haxework/animate/FadeAnimate.hx index 31fdb7b..941bcc8 100755 --- a/src/main/haxework/animate/FadeAnimate.hx +++ b/src/main/haxework/animate/FadeAnimate.hx @@ -2,7 +2,7 @@ package haxework.animate; import flash.display.DisplayObject; import haxework.animate.IAnimate; -import haxework.gui.IView; +import haxework.view.IView; import haxework.animate.Animate; class FadeAnimate extends Animate { diff --git a/src/main/haxework/animate/SlideAnimate.hx b/src/main/haxework/animate/SlideAnimate.hx index 86d64e3..9ac7997 100644 --- a/src/main/haxework/animate/SlideAnimate.hx +++ b/src/main/haxework/animate/SlideAnimate.hx @@ -1,7 +1,7 @@ package haxework.animate; import flash.display.DisplayObject; -import haxework.gui.IView; +import haxework.view.IView; class SlideAnimate extends Animate { diff --git a/src/main/haxework/animate/UnFadeAnimate.hx b/src/main/haxework/animate/UnFadeAnimate.hx index 23e3f02..8c1e8ab 100755 --- a/src/main/haxework/animate/UnFadeAnimate.hx +++ b/src/main/haxework/animate/UnFadeAnimate.hx @@ -1,7 +1,7 @@ package haxework.animate; import flash.display.DisplayObject; -import haxework.gui.IView; +import haxework.view.IView; import haxework.animate.Animate; class UnFadeAnimate extends Animate { diff --git a/src/main/haxework/resources/IResources.hx b/src/main/haxework/resources/IResources.hx index 7c965da..4ab5d42 100755 --- a/src/main/haxework/resources/IResources.hx +++ b/src/main/haxework/resources/IResources.hx @@ -2,7 +2,7 @@ package haxework.resources; import flash.display.BitmapData; import flash.display.MovieClip; -import haxework.gui.skin.ISkin.SkinSet; +import haxework.view.skin.ISkin.SkinSet; import haxework.resources.Resources.ResMap; interface IResources { diff --git a/src/main/haxework/resources/Resources.hx b/src/main/haxework/resources/Resources.hx index f1a99ba..a352899 100755 --- a/src/main/haxework/resources/Resources.hx +++ b/src/main/haxework/resources/Resources.hx @@ -3,7 +3,7 @@ package haxework.resources; import flash.display.BitmapData; import flash.display.MovieClip; import haxe.ds.StringMap; -import haxework.gui.skin.ISkin; +import haxework.view.skin.ISkin; private typedef Listener = {object:Dynamic, field:String}; diff --git a/src/main/haxework/gui/ButtonView.hx b/src/main/haxework/view/ButtonView.hx similarity index 99% rename from src/main/haxework/gui/ButtonView.hx rename to src/main/haxework/view/ButtonView.hx index 822ed17..cd61be3 100755 --- a/src/main/haxework/gui/ButtonView.hx +++ b/src/main/haxework/view/ButtonView.hx @@ -1,4 +1,4 @@ -package haxework.gui; +package haxework.view; import haxework.signal.Signal; import flash.events.MouseEvent; diff --git a/src/main/haxework/gui/DataView.hx b/src/main/haxework/view/DataView.hx similarity index 98% rename from src/main/haxework/gui/DataView.hx rename to src/main/haxework/view/DataView.hx index 05e29a3..3c00bb7 100644 --- a/src/main/haxework/gui/DataView.hx +++ b/src/main/haxework/view/DataView.hx @@ -1,4 +1,4 @@ -package haxework.gui; +package haxework.view; import flash.display.DisplayObject; import flash.events.MouseEvent; diff --git a/src/main/haxework/gui/GroupView.hx b/src/main/haxework/view/GroupView.hx similarity index 96% rename from src/main/haxework/gui/GroupView.hx rename to src/main/haxework/view/GroupView.hx index e895668..938b6b0 100755 --- a/src/main/haxework/gui/GroupView.hx +++ b/src/main/haxework/view/GroupView.hx @@ -1,8 +1,8 @@ -package haxework.gui; +package haxework.view; import flash.display.DisplayObjectContainer; -import haxework.gui.layout.DefaultLayout; -import haxework.gui.layout.ILayout; +import haxework.view.layout.DefaultLayout; +import haxework.view.layout.ILayout; class GroupView extends SpriteView implements IGroupView { public var container(get, null):DisplayObjectContainer; diff --git a/src/main/haxework/gui/HGroupView.hx b/src/main/haxework/view/HGroupView.hx similarity index 60% rename from src/main/haxework/gui/HGroupView.hx rename to src/main/haxework/view/HGroupView.hx index c75c8c3..706922e 100755 --- a/src/main/haxework/gui/HGroupView.hx +++ b/src/main/haxework/view/HGroupView.hx @@ -1,6 +1,6 @@ -package haxework.gui; +package haxework.view; -import haxework.gui.layout.HorizontalLayout; +import haxework.view.layout.HorizontalLayout; class HGroupView extends GroupView { diff --git a/src/main/haxework/gui/IGroupView.hx b/src/main/haxework/view/IGroupView.hx similarity index 90% rename from src/main/haxework/gui/IGroupView.hx rename to src/main/haxework/view/IGroupView.hx index 770033a..388d024 100755 --- a/src/main/haxework/gui/IGroupView.hx +++ b/src/main/haxework/view/IGroupView.hx @@ -1,7 +1,7 @@ -package haxework.gui; +package haxework.view; import flash.display.DisplayObjectContainer; -import haxework.gui.layout.ILayout; +import haxework.view.layout.ILayout; interface IGroupView extends IView { public var container(get, null):DisplayObjectContainer; diff --git a/src/main/haxework/gui/ITextView.hx b/src/main/haxework/view/ITextView.hx similarity index 90% rename from src/main/haxework/gui/ITextView.hx rename to src/main/haxework/view/ITextView.hx index 0401913..e23a7e1 100755 --- a/src/main/haxework/gui/ITextView.hx +++ b/src/main/haxework/view/ITextView.hx @@ -1,7 +1,7 @@ -package haxework.gui; +package haxework.view; import flash.text.TextField; -import haxework.gui.IView; +import haxework.view.IView; import flash.text.TextFormatAlign; interface ITextView extends IView { diff --git a/src/main/haxework/gui/IView.hx b/src/main/haxework/view/IView.hx similarity index 90% rename from src/main/haxework/gui/IView.hx rename to src/main/haxework/view/IView.hx index 1cae3f9..bc18c3d 100755 --- a/src/main/haxework/gui/IView.hx +++ b/src/main/haxework/view/IView.hx @@ -1,8 +1,8 @@ -package haxework.gui; +package haxework.view; import flash.display.DisplayObject; -import haxework.gui.core.Geometry; -import haxework.gui.skin.ISkin.SkinSet; +import haxework.view.core.Geometry; +import haxework.view.skin.ISkin.SkinSet; interface IView { public var id(default, default):String; diff --git a/src/main/haxework/gui/ImageView.hx b/src/main/haxework/view/ImageView.hx similarity index 91% rename from src/main/haxework/gui/ImageView.hx rename to src/main/haxework/view/ImageView.hx index 00dc299..63d3c60 100755 --- a/src/main/haxework/gui/ImageView.hx +++ b/src/main/haxework/view/ImageView.hx @@ -1,10 +1,10 @@ -package haxework.gui; +package haxework.view; import flash.display.BitmapData; -import haxework.gui.skin.BitmapSkin; -import haxework.gui.skin.ISkin; -import haxework.gui.utils.BitmapUtil; -import haxework.gui.utils.DrawUtil.FillType; +import haxework.view.skin.BitmapSkin; +import haxework.view.skin.ISkin; +import haxework.view.utils.BitmapUtil; +import haxework.view.utils.DrawUtil.FillType; import haxework.net.ImageLoader; class ImageView extends SpriteView { diff --git a/src/main/haxework/gui/InputTextField.hx b/src/main/haxework/view/InputTextField.hx similarity index 98% rename from src/main/haxework/gui/InputTextField.hx rename to src/main/haxework/view/InputTextField.hx index 6e37c4b..3357239 100644 --- a/src/main/haxework/gui/InputTextField.hx +++ b/src/main/haxework/view/InputTextField.hx @@ -1,4 +1,4 @@ -package haxework.gui; +package haxework.view; import flash.events.Event; import flash.ui.Keyboard; @@ -66,4 +66,4 @@ class InputTextField extends TextField { border = false; } #end -} \ No newline at end of file +} diff --git a/src/main/haxework/gui/InputView.hx b/src/main/haxework/view/InputView.hx similarity index 99% rename from src/main/haxework/gui/InputView.hx rename to src/main/haxework/view/InputView.hx index baa4647..88d13ff 100755 --- a/src/main/haxework/gui/InputView.hx +++ b/src/main/haxework/view/InputView.hx @@ -1,4 +1,4 @@ -package haxework.gui; +package haxework.view; import flash.events.Event; import flash.events.KeyboardEvent; diff --git a/src/main/haxework/gui/LabelView.hx b/src/main/haxework/view/LabelView.hx similarity index 76% rename from src/main/haxework/gui/LabelView.hx rename to src/main/haxework/view/LabelView.hx index 00b3f84..e4e1638 100755 --- a/src/main/haxework/gui/LabelView.hx +++ b/src/main/haxework/view/LabelView.hx @@ -1,7 +1,7 @@ -package haxework.gui; +package haxework.view; -import haxework.gui.core.VAlign; -import haxework.gui.core.HAlign; +import haxework.view.core.VAlign; +import haxework.view.core.HAlign; class LabelView extends TextView { diff --git a/src/main/haxework/gui/MovieView.hx b/src/main/haxework/view/MovieView.hx similarity index 98% rename from src/main/haxework/gui/MovieView.hx rename to src/main/haxework/view/MovieView.hx index aa58f4c..52b0cd5 100755 --- a/src/main/haxework/gui/MovieView.hx +++ b/src/main/haxework/view/MovieView.hx @@ -1,4 +1,4 @@ -package haxework.gui; +package haxework.view; import haxework.net.SwfLoader; import flash.display.MovieClip; diff --git a/src/main/haxework/gui/ProgressView.hx b/src/main/haxework/view/ProgressView.hx similarity index 95% rename from src/main/haxework/gui/ProgressView.hx rename to src/main/haxework/view/ProgressView.hx index de8f1f9..c89844c 100755 --- a/src/main/haxework/gui/ProgressView.hx +++ b/src/main/haxework/view/ProgressView.hx @@ -1,4 +1,4 @@ -package haxework.gui; +package haxework.view; class ProgressView extends SpriteView { @@ -26,4 +26,4 @@ class ProgressView extends SpriteView { } return max; } -} \ No newline at end of file +} diff --git a/src/main/haxework/gui/Root.hx b/src/main/haxework/view/Root.hx similarity index 99% rename from src/main/haxework/gui/Root.hx rename to src/main/haxework/view/Root.hx index bdeb73a..02ea5b2 100755 --- a/src/main/haxework/gui/Root.hx +++ b/src/main/haxework/view/Root.hx @@ -1,4 +1,4 @@ -package haxework.gui; +package haxework.view; import flash.display.DisplayObject; import flash.display.StageAlign; diff --git a/src/main/haxework/gui/ScrollView.hx b/src/main/haxework/view/ScrollView.hx similarity index 94% rename from src/main/haxework/gui/ScrollView.hx rename to src/main/haxework/view/ScrollView.hx index 5337506..9100220 100644 --- a/src/main/haxework/gui/ScrollView.hx +++ b/src/main/haxework/view/ScrollView.hx @@ -1,11 +1,11 @@ -package haxework.gui; +package haxework.view; import flash.display.DisplayObject; import flash.display.Sprite; import flash.events.MouseEvent; -import haxework.gui.core.Geometry.Position; -import haxework.gui.list.ScrollBarView; -import haxework.gui.skin.Skin; +import haxework.view.core.Geometry.Position; +import haxework.view.list.ScrollBarView; +import haxework.view.skin.Skin; import haxework.signal.Signal; class ScrollView extends HGroupView { diff --git a/src/main/haxework/gui/SpriteView.hx b/src/main/haxework/view/SpriteView.hx similarity index 94% rename from src/main/haxework/gui/SpriteView.hx rename to src/main/haxework/view/SpriteView.hx index bf47b37..92c0441 100755 --- a/src/main/haxework/gui/SpriteView.hx +++ b/src/main/haxework/view/SpriteView.hx @@ -1,4 +1,4 @@ -package haxework.gui; +package haxework.view; import flash.display.Sprite; diff --git a/src/main/haxework/gui/TextView.hx b/src/main/haxework/view/TextView.hx similarity index 97% rename from src/main/haxework/gui/TextView.hx rename to src/main/haxework/view/TextView.hx index e780b24..6680103 100755 --- a/src/main/haxework/gui/TextView.hx +++ b/src/main/haxework/view/TextView.hx @@ -1,13 +1,13 @@ -package haxework.gui; +package haxework.view; -import haxework.gui.layout.ILayout; -import haxework.gui.layout.Layout; +import haxework.view.layout.ILayout; +import haxework.view.layout.Layout; import flash.text.TextField; import flash.text.TextFieldAutoSize; import flash.text.TextFormat; import flash.text.TextFormatAlign; -import haxework.gui.core.HAlign; -import haxework.gui.core.VAlign; +import haxework.view.core.HAlign; +import haxework.view.core.VAlign; import haxework.text.BitmapTextField; import haxework.text.TextUtil; diff --git a/src/main/haxework/gui/ToggleButtonView.hx b/src/main/haxework/view/ToggleButtonView.hx similarity index 96% rename from src/main/haxework/gui/ToggleButtonView.hx rename to src/main/haxework/view/ToggleButtonView.hx index 4938dba..c03e8a4 100755 --- a/src/main/haxework/gui/ToggleButtonView.hx +++ b/src/main/haxework/view/ToggleButtonView.hx @@ -1,4 +1,4 @@ -package haxework.gui; +package haxework.view; class ToggleButtonView extends ButtonView { diff --git a/src/main/haxework/gui/VGroupView.hx b/src/main/haxework/view/VGroupView.hx similarity index 61% rename from src/main/haxework/gui/VGroupView.hx rename to src/main/haxework/view/VGroupView.hx index e37f486..68eefd7 100755 --- a/src/main/haxework/gui/VGroupView.hx +++ b/src/main/haxework/view/VGroupView.hx @@ -1,6 +1,6 @@ -package haxework.gui; +package haxework.view; -import haxework.gui.layout.VerticalLayout; +import haxework.view.layout.VerticalLayout; class VGroupView extends GroupView { diff --git a/src/main/haxework/gui/View.hx b/src/main/haxework/view/View.hx similarity index 96% rename from src/main/haxework/gui/View.hx rename to src/main/haxework/view/View.hx index ae87c70..1086678 100755 --- a/src/main/haxework/gui/View.hx +++ b/src/main/haxework/view/View.hx @@ -1,10 +1,10 @@ -package haxework.gui; +package haxework.view; import flash.display.DisplayObject; import flash.display.InteractiveObject; -import haxework.gui.core.Geometry; -import haxework.gui.skin.ISkin.ISizeSkin; -import haxework.gui.skin.ISkin.SkinSet; +import haxework.view.core.Geometry; +import haxework.view.skin.ISkin.ISizeSkin; +import haxework.view.skin.ISkin.SkinSet; import haxework.resources.IResources; class View implements IView { diff --git a/src/main/haxework/gui/ViewUpdater.hx b/src/main/haxework/view/ViewUpdater.hx similarity index 98% rename from src/main/haxework/gui/ViewUpdater.hx rename to src/main/haxework/view/ViewUpdater.hx index 79db1d8..780ec3c 100644 --- a/src/main/haxework/gui/ViewUpdater.hx +++ b/src/main/haxework/view/ViewUpdater.hx @@ -1,4 +1,4 @@ -package haxework.gui; +package haxework.view; import flash.events.Event; import flash.display.Stage; diff --git a/src/main/haxework/gui/core/Box.hx b/src/main/haxework/view/core/Box.hx similarity index 98% rename from src/main/haxework/gui/core/Box.hx rename to src/main/haxework/view/core/Box.hx index 516f090..6428834 100644 --- a/src/main/haxework/gui/core/Box.hx +++ b/src/main/haxework/view/core/Box.hx @@ -1,4 +1,4 @@ -package haxework.gui.core; +package haxework.view.core; abstract Box(Array) { public var left(get, set):Float; diff --git a/src/main/haxework/gui/core/Geometry.hx b/src/main/haxework/view/core/Geometry.hx similarity index 99% rename from src/main/haxework/gui/core/Geometry.hx rename to src/main/haxework/view/core/Geometry.hx index 34a5c57..d76a7b7 100644 --- a/src/main/haxework/gui/core/Geometry.hx +++ b/src/main/haxework/view/core/Geometry.hx @@ -1,4 +1,4 @@ -package haxework.gui.core; +package haxework.view.core; enum SizeValue { FIXED(value:Float); diff --git a/src/main/haxework/gui/core/HAlign.hx b/src/main/haxework/view/core/HAlign.hx similarity index 84% rename from src/main/haxework/gui/core/HAlign.hx rename to src/main/haxework/view/core/HAlign.hx index e063b16..60ef2f0 100755 --- a/src/main/haxework/gui/core/HAlign.hx +++ b/src/main/haxework/view/core/HAlign.hx @@ -1,4 +1,4 @@ -package haxework.gui.core; +package haxework.view.core; @:enum abstract HAlign(String) from String to String { var NONE = "none"; diff --git a/src/main/haxework/gui/core/Size.hx b/src/main/haxework/view/core/Size.hx similarity index 97% rename from src/main/haxework/gui/core/Size.hx rename to src/main/haxework/view/core/Size.hx index f6ff0e7..9eac2d2 100644 --- a/src/main/haxework/gui/core/Size.hx +++ b/src/main/haxework/view/core/Size.hx @@ -1,4 +1,4 @@ -package haxework.gui.core; +package haxework.view.core; abstract Size(Array) { public var width(get, set):Float; diff --git a/src/main/haxework/gui/core/VAlign.hx b/src/main/haxework/view/core/VAlign.hx similarity index 84% rename from src/main/haxework/gui/core/VAlign.hx rename to src/main/haxework/view/core/VAlign.hx index 142990e..6be9df9 100755 --- a/src/main/haxework/gui/core/VAlign.hx +++ b/src/main/haxework/view/core/VAlign.hx @@ -1,4 +1,4 @@ -package haxework.gui.core; +package haxework.view.core; @:enum abstract VAlign(String) from String to String { var NONE = "none"; diff --git a/src/main/haxework/gui/frame/FrameSwitcher.hx b/src/main/haxework/view/frame/FrameSwitcher.hx similarity index 96% rename from src/main/haxework/gui/frame/FrameSwitcher.hx rename to src/main/haxework/view/frame/FrameSwitcher.hx index 3e06946..75eb017 100755 --- a/src/main/haxework/gui/frame/FrameSwitcher.hx +++ b/src/main/haxework/view/frame/FrameSwitcher.hx @@ -1,9 +1,9 @@ -package haxework.gui.frame; +package haxework.view.frame; import haxework.signal.Signal; import haxework.animate.IAnimate; -import haxework.gui.IView; -import haxework.gui.GroupView; +import haxework.view.IView; +import haxework.view.GroupView; class FrameSwitcher extends GroupView { diff --git a/src/main/haxework/gui/layout/DefaultLayout.hx b/src/main/haxework/view/layout/DefaultLayout.hx similarity index 95% rename from src/main/haxework/gui/layout/DefaultLayout.hx rename to src/main/haxework/view/layout/DefaultLayout.hx index d2f9fb2..e8c8749 100755 --- a/src/main/haxework/gui/layout/DefaultLayout.hx +++ b/src/main/haxework/view/layout/DefaultLayout.hx @@ -1,8 +1,8 @@ -package haxework.gui.layout; +package haxework.view.layout; -import haxework.gui.core.Geometry; -import haxework.gui.core.VAlign; -import haxework.gui.core.HAlign; +import haxework.view.core.Geometry; +import haxework.view.core.VAlign; +import haxework.view.core.HAlign; class DefaultLayout extends Layout { diff --git a/src/main/haxework/gui/layout/HorizontalLayout.hx b/src/main/haxework/view/layout/HorizontalLayout.hx similarity index 94% rename from src/main/haxework/gui/layout/HorizontalLayout.hx rename to src/main/haxework/view/layout/HorizontalLayout.hx index c76bcc6..1a522a9 100755 --- a/src/main/haxework/gui/layout/HorizontalLayout.hx +++ b/src/main/haxework/view/layout/HorizontalLayout.hx @@ -1,7 +1,7 @@ -package haxework.gui.layout; +package haxework.view.layout; -import haxework.gui.core.Geometry.SizeValue; -import haxework.gui.core.HAlign; +import haxework.view.core.Geometry.SizeValue; +import haxework.view.core.HAlign; class HorizontalLayout extends DefaultLayout { diff --git a/src/main/haxework/gui/layout/ILayout.hx b/src/main/haxework/view/layout/ILayout.hx similarity index 79% rename from src/main/haxework/gui/layout/ILayout.hx rename to src/main/haxework/view/layout/ILayout.hx index ce4ee00..bceae9f 100755 --- a/src/main/haxework/gui/layout/ILayout.hx +++ b/src/main/haxework/view/layout/ILayout.hx @@ -1,7 +1,7 @@ -package haxework.gui.layout; +package haxework.view.layout; -import haxework.gui.core.VAlign; -import haxework.gui.core.HAlign; +import haxework.view.core.VAlign; +import haxework.view.core.HAlign; interface ILayout { public var hAlign(default, default):HAlign; diff --git a/src/main/haxework/gui/layout/Layout.hx b/src/main/haxework/view/layout/Layout.hx similarity index 86% rename from src/main/haxework/gui/layout/Layout.hx rename to src/main/haxework/view/layout/Layout.hx index 8f91194..921360b 100644 --- a/src/main/haxework/gui/layout/Layout.hx +++ b/src/main/haxework/view/layout/Layout.hx @@ -1,6 +1,6 @@ -package haxework.gui.layout; -import haxework.gui.core.VAlign; -import haxework.gui.core.HAlign; +package haxework.view.layout; +import haxework.view.core.VAlign; +import haxework.view.core.HAlign; class Layout implements ILayout { diff --git a/src/main/haxework/gui/layout/TailLayout.hx b/src/main/haxework/view/layout/TailLayout.hx similarity index 97% rename from src/main/haxework/gui/layout/TailLayout.hx rename to src/main/haxework/view/layout/TailLayout.hx index fa22e54..586e300 100644 --- a/src/main/haxework/gui/layout/TailLayout.hx +++ b/src/main/haxework/view/layout/TailLayout.hx @@ -1,6 +1,6 @@ -package haxework.gui.layout; +package haxework.view.layout; -import haxework.gui.core.VAlign; +import haxework.view.core.VAlign; typedef Row = { var width:Float; var height:Float; diff --git a/src/main/haxework/gui/layout/VerticalLayout.hx b/src/main/haxework/view/layout/VerticalLayout.hx similarity index 94% rename from src/main/haxework/gui/layout/VerticalLayout.hx rename to src/main/haxework/view/layout/VerticalLayout.hx index e34e52c..1de8a5f 100755 --- a/src/main/haxework/gui/layout/VerticalLayout.hx +++ b/src/main/haxework/view/layout/VerticalLayout.hx @@ -1,7 +1,7 @@ -package haxework.gui.layout; +package haxework.view.layout; -import haxework.gui.core.VAlign; -import haxework.gui.core.Geometry.SizeValue; +import haxework.view.core.VAlign; +import haxework.view.core.Geometry.SizeValue; class VerticalLayout extends DefaultLayout { diff --git a/src/main/haxework/gui/list/HListView.hx b/src/main/haxework/view/list/HListView.hx similarity index 78% rename from src/main/haxework/gui/list/HListView.hx rename to src/main/haxework/view/list/HListView.hx index 2da214a..046e49e 100755 --- a/src/main/haxework/gui/list/HListView.hx +++ b/src/main/haxework/view/list/HListView.hx @@ -1,11 +1,11 @@ -package haxework.gui.list; +package haxework.view.list; -import haxework.gui.core.Geometry.SizeValue; -import haxework.gui.core.HAlign; -import haxework.gui.core.VAlign; -import haxework.gui.layout.HorizontalLayout; -import haxework.gui.layout.VerticalLayout; -import haxework.gui.list.ListView.IListItemView; +import haxework.view.core.Geometry.SizeValue; +import haxework.view.core.HAlign; +import haxework.view.core.VAlign; +import haxework.view.layout.HorizontalLayout; +import haxework.view.layout.VerticalLayout; +import haxework.view.list.ListView.IListItemView; class HListView extends ListView { diff --git a/src/main/haxework/gui/list/HScrollBarView.hx b/src/main/haxework/view/list/HScrollBarView.hx similarity index 94% rename from src/main/haxework/gui/list/HScrollBarView.hx rename to src/main/haxework/view/list/HScrollBarView.hx index 34e4e8f..adc7e8f 100755 --- a/src/main/haxework/gui/list/HScrollBarView.hx +++ b/src/main/haxework/view/list/HScrollBarView.hx @@ -1,4 +1,4 @@ -package haxework.gui.list; +package haxework.view.list; import flash.geom.Point; diff --git a/src/main/haxework/gui/list/LabelListItem.hx b/src/main/haxework/view/list/LabelListItem.hx similarity index 88% rename from src/main/haxework/gui/list/LabelListItem.hx rename to src/main/haxework/view/list/LabelListItem.hx index 5755079..53b7716 100644 --- a/src/main/haxework/gui/list/LabelListItem.hx +++ b/src/main/haxework/view/list/LabelListItem.hx @@ -1,7 +1,7 @@ -package haxework.gui.list; +package haxework.view.list; -import haxework.gui.core.HAlign; -import haxework.gui.list.ListView.IListItemView; +import haxework.view.core.HAlign; +import haxework.view.list.ListView.IListItemView; private typedef Formatter = Int -> T -> String; diff --git a/src/main/haxework/gui/list/ListView.hx b/src/main/haxework/view/list/ListView.hx similarity index 97% rename from src/main/haxework/gui/list/ListView.hx rename to src/main/haxework/view/list/ListView.hx index 8067918..04ec837 100755 --- a/src/main/haxework/gui/list/ListView.hx +++ b/src/main/haxework/view/list/ListView.hx @@ -1,11 +1,11 @@ -package haxework.gui.list; +package haxework.view.list; import flash.events.MouseEvent; -import haxework.gui.core.Geometry.Position; -import haxework.gui.core.HAlign; -import haxework.gui.core.VAlign; -import haxework.gui.layout.ILayout; -import haxework.gui.skin.Skin; +import haxework.view.core.Geometry.Position; +import haxework.view.core.HAlign; +import haxework.view.core.VAlign; +import haxework.view.layout.ILayout; +import haxework.view.skin.Skin; import haxework.signal.Signal; import haxework.utils.NumberUtil; diff --git a/src/main/haxework/gui/list/ScrollBarView.hx b/src/main/haxework/view/list/ScrollBarView.hx similarity index 98% rename from src/main/haxework/gui/list/ScrollBarView.hx rename to src/main/haxework/view/list/ScrollBarView.hx index 5b3dcba..91c3828 100755 --- a/src/main/haxework/gui/list/ScrollBarView.hx +++ b/src/main/haxework/view/list/ScrollBarView.hx @@ -1,4 +1,4 @@ -package haxework.gui.list; +package haxework.view.list; import haxework.signal.Signal; import haxework.utils.NumberUtil; diff --git a/src/main/haxework/gui/list/VListView.hx b/src/main/haxework/view/list/VListView.hx similarity index 78% rename from src/main/haxework/gui/list/VListView.hx rename to src/main/haxework/view/list/VListView.hx index de02552..bfd6af5 100755 --- a/src/main/haxework/gui/list/VListView.hx +++ b/src/main/haxework/view/list/VListView.hx @@ -1,11 +1,11 @@ -package haxework.gui.list; +package haxework.view.list; -import haxework.gui.core.Geometry.SizeValue; -import haxework.gui.core.HAlign; -import haxework.gui.core.VAlign; -import haxework.gui.layout.HorizontalLayout; -import haxework.gui.layout.VerticalLayout; -import haxework.gui.list.ListView.IListItemView; +import haxework.view.core.Geometry.SizeValue; +import haxework.view.core.HAlign; +import haxework.view.core.VAlign; +import haxework.view.layout.HorizontalLayout; +import haxework.view.layout.VerticalLayout; +import haxework.view.list.ListView.IListItemView; class VListView extends ListView { diff --git a/src/main/haxework/gui/list/VScrollBarView.hx b/src/main/haxework/view/list/VScrollBarView.hx similarity index 94% rename from src/main/haxework/gui/list/VScrollBarView.hx rename to src/main/haxework/view/list/VScrollBarView.hx index eda6675..e92e55e 100755 --- a/src/main/haxework/gui/list/VScrollBarView.hx +++ b/src/main/haxework/view/list/VScrollBarView.hx @@ -1,4 +1,4 @@ -package haxework.gui.list; +package haxework.view.list; import flash.geom.Point; diff --git a/src/main/haxework/gui/popup/PopupManager.hx b/src/main/haxework/view/popup/PopupManager.hx similarity index 92% rename from src/main/haxework/gui/popup/PopupManager.hx rename to src/main/haxework/view/popup/PopupManager.hx index 31c1ce5..9b83438 100755 --- a/src/main/haxework/gui/popup/PopupManager.hx +++ b/src/main/haxework/view/popup/PopupManager.hx @@ -1,8 +1,8 @@ -package haxework.gui.popup; +package haxework.view.popup; import haxework.animate.IAnimate; -import haxework.gui.Root; -import haxework.gui.IGroupView; +import haxework.view.Root; +import haxework.view.IGroupView; typedef P = PopupView; diff --git a/src/main/haxework/gui/popup/PopupView.hx b/src/main/haxework/view/popup/PopupView.hx similarity index 85% rename from src/main/haxework/gui/popup/PopupView.hx rename to src/main/haxework/view/popup/PopupView.hx index 14412a7..a06d485 100755 --- a/src/main/haxework/gui/popup/PopupView.hx +++ b/src/main/haxework/view/popup/PopupView.hx @@ -1,8 +1,8 @@ -package haxework.gui.popup; +package haxework.view.popup; -import haxework.gui.core.Geometry.Position; -import haxework.gui.GroupView; -import haxework.gui.skin.Skin; +import haxework.view.core.Geometry.Position; +import haxework.view.GroupView; +import haxework.view.skin.Skin; import promhx.Deferred; import promhx.Promise; diff --git a/src/main/haxework/gui/skin/BitmapSkin.hx b/src/main/haxework/view/skin/BitmapSkin.hx similarity index 90% rename from src/main/haxework/gui/skin/BitmapSkin.hx rename to src/main/haxework/view/skin/BitmapSkin.hx index e6a7049..c7af97b 100755 --- a/src/main/haxework/gui/skin/BitmapSkin.hx +++ b/src/main/haxework/view/skin/BitmapSkin.hx @@ -1,9 +1,9 @@ -package haxework.gui.skin; +package haxework.view.skin; import flash.display.BitmapData; import flash.geom.Rectangle; -import haxework.gui.skin.ISkin.ISizeSkin; -import haxework.gui.utils.DrawUtil; +import haxework.view.skin.ISkin.ISizeSkin; +import haxework.view.utils.DrawUtil; class BitmapSkin implements ISkin implements ISizeSkin { public var width(default, null):Float; diff --git a/src/main/haxework/gui/skin/BorderSkin.hx b/src/main/haxework/view/skin/BorderSkin.hx similarity index 95% rename from src/main/haxework/gui/skin/BorderSkin.hx rename to src/main/haxework/view/skin/BorderSkin.hx index 092ba79..d87e3dd 100644 --- a/src/main/haxework/gui/skin/BorderSkin.hx +++ b/src/main/haxework/view/skin/BorderSkin.hx @@ -1,4 +1,4 @@ -package haxework.gui.skin; +package haxework.view.skin; class BorderSkin implements ISkin { diff --git a/src/main/haxework/gui/skin/ButtonBitmapSkin.hx b/src/main/haxework/view/skin/ButtonBitmapSkin.hx similarity index 91% rename from src/main/haxework/gui/skin/ButtonBitmapSkin.hx rename to src/main/haxework/view/skin/ButtonBitmapSkin.hx index 69195fc..7d97350 100755 --- a/src/main/haxework/gui/skin/ButtonBitmapSkin.hx +++ b/src/main/haxework/view/skin/ButtonBitmapSkin.hx @@ -1,11 +1,11 @@ -package haxework.gui.skin; +package haxework.view.skin; import flash.display.BitmapData; import flash.geom.Rectangle; -import haxework.gui.ButtonView.ButtonState; -import haxework.gui.skin.ISkin.ISizeSkin; -import haxework.gui.utils.BitmapUtil; -import haxework.gui.utils.DrawUtil; +import haxework.view.ButtonView.ButtonState; +import haxework.view.skin.ISkin.ISizeSkin; +import haxework.view.utils.BitmapUtil; +import haxework.view.utils.DrawUtil; class ButtonBitmapSkin implements ISkin implements ISizeSkin { diff --git a/src/main/haxework/gui/skin/ButtonColorSkin.hx b/src/main/haxework/view/skin/ButtonColorSkin.hx similarity index 95% rename from src/main/haxework/gui/skin/ButtonColorSkin.hx rename to src/main/haxework/view/skin/ButtonColorSkin.hx index 39d7402..f3ff410 100644 --- a/src/main/haxework/gui/skin/ButtonColorSkin.hx +++ b/src/main/haxework/view/skin/ButtonColorSkin.hx @@ -1,11 +1,11 @@ -package haxework.gui.skin; +package haxework.view.skin; import flash.display.LineScaleMode; import flash.display.JointStyle; import flash.display.CapsStyle; import flash.display.Graphics; import haxework.color.ColorUtil; -import haxework.gui.ButtonView.ButtonState; +import haxework.view.ButtonView.ButtonState; class ButtonColorSkin implements ISkin { diff --git a/src/main/haxework/gui/skin/ColorSkin.hx b/src/main/haxework/view/skin/ColorSkin.hx similarity index 94% rename from src/main/haxework/gui/skin/ColorSkin.hx rename to src/main/haxework/view/skin/ColorSkin.hx index a585fcd..050dbc2 100644 --- a/src/main/haxework/gui/skin/ColorSkin.hx +++ b/src/main/haxework/view/skin/ColorSkin.hx @@ -1,4 +1,4 @@ -package haxework.gui.skin; +package haxework.view.skin; class ColorSkin implements ISkin { diff --git a/src/main/haxework/gui/skin/GeometrySkin.hx b/src/main/haxework/view/skin/GeometrySkin.hx similarity index 92% rename from src/main/haxework/gui/skin/GeometrySkin.hx rename to src/main/haxework/view/skin/GeometrySkin.hx index f770431..807cb3e 100644 --- a/src/main/haxework/gui/skin/GeometrySkin.hx +++ b/src/main/haxework/view/skin/GeometrySkin.hx @@ -1,8 +1,8 @@ -package haxework.gui.skin; +package haxework.view.skin; -import haxework.gui.core.HAlign; -import haxework.gui.core.VAlign; -import haxework.gui.core.Geometry; +import haxework.view.core.HAlign; +import haxework.view.core.VAlign; +import haxework.view.core.Geometry; class GeometrySkin implements ISkin> { diff --git a/src/main/haxework/gui/skin/HScrollBarSkin.hx b/src/main/haxework/view/skin/HScrollBarSkin.hx similarity index 93% rename from src/main/haxework/gui/skin/HScrollBarSkin.hx rename to src/main/haxework/view/skin/HScrollBarSkin.hx index 0839dd0..f3594c0 100644 --- a/src/main/haxework/gui/skin/HScrollBarSkin.hx +++ b/src/main/haxework/view/skin/HScrollBarSkin.hx @@ -1,7 +1,7 @@ -package haxework.gui.skin; +package haxework.view.skin; import haxework.color.ColorUtil; -import haxework.gui.list.ScrollBarView; +import haxework.view.list.ScrollBarView; class HScrollBarSkin implements ISkin { public var foreColor(default, default):Int; diff --git a/src/main/haxework/gui/skin/ISkin.hx b/src/main/haxework/view/skin/ISkin.hx similarity index 89% rename from src/main/haxework/gui/skin/ISkin.hx rename to src/main/haxework/view/skin/ISkin.hx index 6bf25b0..a5ccdfc 100644 --- a/src/main/haxework/gui/skin/ISkin.hx +++ b/src/main/haxework/view/skin/ISkin.hx @@ -1,4 +1,4 @@ -package haxework.gui.skin; +package haxework.view.skin; interface ISkin> { public function draw(view: V): Void; diff --git a/src/main/haxework/gui/skin/LayoutSkin.hx b/src/main/haxework/view/skin/LayoutSkin.hx similarity index 85% rename from src/main/haxework/gui/skin/LayoutSkin.hx rename to src/main/haxework/view/skin/LayoutSkin.hx index a9ac63a..6c2569e 100644 --- a/src/main/haxework/gui/skin/LayoutSkin.hx +++ b/src/main/haxework/view/skin/LayoutSkin.hx @@ -1,8 +1,8 @@ -package haxework.gui.skin; +package haxework.view.skin; -import haxework.gui.core.HAlign; -import haxework.gui.core.VAlign; -import haxework.gui.layout.ILayout; +import haxework.view.core.HAlign; +import haxework.view.core.VAlign; +import haxework.view.layout.ILayout; class LayoutSkin implements ISkin { diff --git a/src/main/haxework/gui/skin/ProgressSkin.hx b/src/main/haxework/view/skin/ProgressSkin.hx similarity index 92% rename from src/main/haxework/gui/skin/ProgressSkin.hx rename to src/main/haxework/view/skin/ProgressSkin.hx index 76c2bce..bd0d39d 100755 --- a/src/main/haxework/gui/skin/ProgressSkin.hx +++ b/src/main/haxework/view/skin/ProgressSkin.hx @@ -1,7 +1,7 @@ -package haxework.gui.skin; +package haxework.view.skin; import flash.display.Graphics; -import haxework.gui.skin.ISkin; +import haxework.view.skin.ISkin; class ProgressSkin implements ISkin { diff --git a/src/main/haxework/gui/skin/Skin.hx b/src/main/haxework/view/skin/Skin.hx similarity index 93% rename from src/main/haxework/gui/skin/Skin.hx rename to src/main/haxework/view/skin/Skin.hx index 4d789c0..7328cba 100644 --- a/src/main/haxework/gui/skin/Skin.hx +++ b/src/main/haxework/view/skin/Skin.hx @@ -1,8 +1,7 @@ -package haxework.gui.skin; +package haxework.view.skin; -import ru.m.tankz.bot.BotHelper; -import haxework.gui.layout.ILayout; -import haxework.gui.core.Geometry; +import haxework.view.layout.ILayout; +import haxework.view.core.Geometry; import flash.display.BitmapData; class Skin { diff --git a/src/main/haxework/gui/skin/TabColorSkin.hx b/src/main/haxework/view/skin/TabColorSkin.hx similarity index 95% rename from src/main/haxework/gui/skin/TabColorSkin.hx rename to src/main/haxework/view/skin/TabColorSkin.hx index bd7c01d..b19ff46 100644 --- a/src/main/haxework/gui/skin/TabColorSkin.hx +++ b/src/main/haxework/view/skin/TabColorSkin.hx @@ -1,4 +1,4 @@ -package haxework.gui.skin; +package haxework.view.skin; import flash.display.Graphics; import haxework.color.ColorUtil; diff --git a/src/main/haxework/gui/skin/TextSkin.hx b/src/main/haxework/view/skin/TextSkin.hx similarity index 91% rename from src/main/haxework/gui/skin/TextSkin.hx rename to src/main/haxework/view/skin/TextSkin.hx index 2d22270..d58249e 100644 --- a/src/main/haxework/gui/skin/TextSkin.hx +++ b/src/main/haxework/view/skin/TextSkin.hx @@ -1,4 +1,4 @@ -package haxework.gui.skin; +package haxework.view.skin; class TextSkin implements ISkin { @@ -7,7 +7,7 @@ class TextSkin implements ISkin { public var fontFamily(default, default):String; public var fontEmbed(default, default):Bool; - public function new(fontColor:Int, fontSize:Int, fontFamily:String, fontEmbed:Bool) { + public function new(fontColor:Int, fontSize:Int, fontFamily:String, fontEmbed:Bool=false) { this.fontColor = fontColor; this.fontSize = fontSize; this.fontFamily = fontFamily; diff --git a/src/main/haxework/gui/skin/VScrollBarSkin.hx b/src/main/haxework/view/skin/VScrollBarSkin.hx similarity index 93% rename from src/main/haxework/gui/skin/VScrollBarSkin.hx rename to src/main/haxework/view/skin/VScrollBarSkin.hx index 5aa591a..841fd05 100644 --- a/src/main/haxework/gui/skin/VScrollBarSkin.hx +++ b/src/main/haxework/view/skin/VScrollBarSkin.hx @@ -1,7 +1,7 @@ -package haxework.gui.skin; +package haxework.view.skin; import haxework.color.ColorUtil; -import haxework.gui.list.ScrollBarView; +import haxework.view.list.ScrollBarView; class VScrollBarSkin implements ISkin { public var foreColor(default, default):Int; diff --git a/src/main/haxework/gui/utils/BitmapUtil.hx b/src/main/haxework/view/utils/BitmapUtil.hx similarity index 98% rename from src/main/haxework/gui/utils/BitmapUtil.hx rename to src/main/haxework/view/utils/BitmapUtil.hx index bc13101..1498b6d 100755 --- a/src/main/haxework/gui/utils/BitmapUtil.hx +++ b/src/main/haxework/view/utils/BitmapUtil.hx @@ -1,4 +1,4 @@ -package haxework.gui.utils; +package haxework.view.utils; import flash.display.BitmapData; import flash.filters.ColorMatrixFilter; diff --git a/src/main/haxework/gui/utils/DrawUtil.hx b/src/main/haxework/view/utils/DrawUtil.hx similarity index 99% rename from src/main/haxework/gui/utils/DrawUtil.hx rename to src/main/haxework/view/utils/DrawUtil.hx index d668afc..785d9e5 100755 --- a/src/main/haxework/gui/utils/DrawUtil.hx +++ b/src/main/haxework/view/utils/DrawUtil.hx @@ -1,4 +1,4 @@ -package haxework.gui.utils; +package haxework.view.utils; import flash.display.Bitmap; import flash.Lib; @@ -127,4 +127,4 @@ class DrawUtil { graphics.drawRect(rect.width - w, h, w, rect.height - h * 2); graphics.endFill(); } -} \ No newline at end of file +}