*misc

5 files changed, 149 insertions, 13 deletions

diff --git a/source/Asura.Editor/widgets/binding/_button.cpp b/source/Asura.Editor/widgets/binding/_button.cpp
new file mode 100644
index 0000000..463aef6
--- /dev/null
+++ b/source/Asura.Editor/widgets/binding/_button.cpp
@@ -0,0 +1,60 @@
+#include "../button.h"
+
+using namespace Luax;
+
+namespace AsuraEditor
+{
+
+	LUAX_REGISTRY(Button)
+	{
+
+		// Button.EStatus.xxx
+		LUAX_REGISTER_ENUM(state, "EStatus",
+			{ "NORMAL",   BUTTON_STATUS_NORMAL },
+			{ "PUSHED",   BUTTON_STATUS_PUSHED },
+			{ "HOVER",    BUTTON_STATUS_HOVER },
+			{ "DISABLED", BUTTON_STATUS_DISABLED },
+			{ "FOCUSED",  BUTTON_STATUS_FOCUSED }
+		);
+
+		// Button.EMsg.xxx
+		LUAX_REGISTER_ENUM(state, "EMessage",
+			{ "CLICK", BUTTON_MSG_CLICK },
+			{ "HOVER", BUTTON_MSG_HOVER },
+			{ "FOCUS", BUTTON_MSG_KILLFOCUS }
+		);
+
+	}
+
+	LUAX_POSTPROCESS(Button)
+	{
+
+	}
+
+	// button:Connect(msg, callback)
+	LUAX_IMPL_METHOD(Button, _Connect)
+	{
+		LUAX_STATE(L);
+
+		Button* self = state.GetUserdata<Button>(1);
+		int msg = state.CheckParam<int>(2);
+		if (!lua_isfunction(L, 3))
+			return state.ErrorType(3, "callback");
+
+		LuaxMemberRef ref;
+		self->SetLuaxMemberRef(state, ref, 3);
+		if (ref)
+		{
+			self->mCallbacksRef.push_back(ref);
+			Slot slot = Slot(state, (*self), ref.refID);
+			self->Connect(msg, slot);
+		}
+	}
+
+	// button:SetImage(image)
+	LUAX_IMPL_METHOD(Button, _SetImage)
+	{
+
+	}
+
+}
\ No newline at end of file
diff --git a/source/Asura.Editor/widgets/button.cpp b/source/Asura.Editor/widgets/button.cpp
index e69de29..97de284 100644
--- a/source/Asura.Editor/widgets/button.cpp
+++ b/source/Asura.Editor/widgets/button.cpp
@@ -0,0 +1,10 @@
+#include "button.h"
+
+namespace AsuraEditor
+{
+
+	Button::Button()
+	{
+	}
+
+}
\ No newline at end of file
diff --git a/source/Asura.Editor/widgets/button.h b/source/Asura.Editor/widgets/button.h
index 00f1c99..8edc919 100644
--- a/source/Asura.Editor/widgets/button.h
+++ b/source/Asura.Editor/widgets/button.h
@@ -1,29 +1,69 @@
 #ifndef __ASURA_EDITOR_BUTTON_H__
 #define __ASURA_EDITOR_BUTTON_H__
 
-// Asura.Engine Headers
-#include <Scripting/Luax.hpp>
+#include <vector>
 
-#include "Widget.h"
+#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-lib-core/graphics/image.h>
+
+#include "../core/signal.h"
+#include "widget.h"
 
 namespace AsuraEditor
 {
 
+	enum ButtonStatus
+	{
+		BUTTON_STATUS_NORMAL   = 0,
+		BUTTON_STATUS_PUSHED   = 1,
+		BUTTON_STATUS_HOVER    = 2,
+		BUTTON_STATUS_DISABLED = 3,
+		BUTTON_STATUS_FOCUSED  = 4,
+		_BUTTON_STATUS_COUNT   = 5,
+	};
+
+	enum ButtonMessage
+	{
+		BUTTON_MSG_CLICK     = 0,
+		BUTTON_MSG_HOVER     = 1, 
+		BUTTON_MSG_KILLFOCUS = 2,
+		_BUTTON_MSG_COUNT    = 3,
+	};
+
 	class Button 
 		: public Widget
 		, public AEScripting::Portable<Button>
 	{
-
 	public: 
 
 		Button();
+		~Button();
+
+		void OnEvent(AEInput::Event& e) override;
+		void OnPaint() override;
+
+		void Connect(int msg, Slot callback);
+		void Disconnect(int msg);
+		void DisconnectAll(int msg);
+		void DisconnectAllMsg();
+
+		int GetStatus();
+		void SetImage(int status, AEGraphics::Image* image);
+
+		LUAX_DECL_FACTORY(Button);
 
 	private:
 
-		// Image mIcon; // ͼ�꣬��������Ҫ
-		// Text mText; //��ť����
+		LUAX_DECL_METHOD(_Connect);
+		LUAX_DECL_METHOD(_Disconnect);
+		LUAX_DECL_METHOD(_SetImage);
+
+		int                              mStatus;                        // ��ǰ״̬
+		Signal                           mSignals[_BUTTON_MSG_COUNT];    // 3����Ϣ��signal
+		AEGraphics::Image*               mImage[_BUTTON_STATUS_COUNT];   // 5��״̬����ͼ
 
-		LUAX_DECL_FACTORY(Button); // AsuraEditor.Button
+		Luax::LuaxMemberRef              mImageRef[_BUTTON_STATUS_COUNT];// ��ͼ������
+		std::vector<Luax::LuaxMemberRef> mCallbacksRef;                  // �ص�����������
 
 	};
 
diff --git a/source/Asura.Editor/widgets/label.h b/source/Asura.Editor/widgets/label.h
index 6889818..1d053f8 100644
--- a/source/Asura.Editor/widgets/label.h
+++ b/source/Asura.Editor/widgets/label.h
@@ -1,15 +1,22 @@
 #ifndef __ASURA_EDITOR_LABEL_H__
 #define __ASURA_EDITOR_LABEL_H__
 
+#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-lib-core/graphics/image.h>
+
+#include "widget.h"
+
 namespace AsuraEditor
 {
 
 	class Label
+		: public Widget
+		, public AEScripting::Portable<Label>
 	{
-
 	public:
 
-
+		void OnEvent(AEInput::Event& e) override;
+		void OnPaint() override;
 
 	};
 
diff --git a/source/Asura.Editor/widgets/widget.h b/source/Asura.Editor/widgets/widget.h
index 5fb18f1..9ffd1fb 100644
--- a/source/Asura.Editor/widgets/widget.h
+++ b/source/Asura.Editor/widgets/widget.h
@@ -1,21 +1,40 @@
 #ifndef __ASURA_EDITOR_WIDGET_H__
 #define __ASURA_EDITOR_WIDGET_H__
 
+#include <list>
+
+#include <asura-lib-utils/scripting/portable.hpp>
 #include <asura-lib-utils/type.h>
+#include <asura-lib-utils/math/rect.hpp>
+#include <asura-lib-utils/math/vector2.hpp>
+#include <asura-lib-core/input/event.h>
 
-namespace AusraEditor
+namespace AsuraEditor
 {
-
+	
 	///
 	/// Asura Editor�Ŀؼ��߼�����������Ⱦ�����ں��¼���ѯ��ֻ�������¼�����Ӧ���߼������ӿڡ�
 	///
 	ASURA_ABSTRACT class Widget 
+		: public virtual AEScripting::NativeAccessor
 	{
 
 	public: 
 
-		// �ؼ��л��Ʒ���
-		virtual void Draw() = 0;
+		///
+		/// �ؼ�ֻ�б����ڵ�ѡ��Ϊfocusʱ�Żᴦ�����룬���Ժܸ�Ч��
+		///
+		virtual void OnEvent(AEInput::Event& e) = 0;
+
+		///
+		///
+		///
+		virtual void OnPaint() = 0;
+
+	protected:
+
+		AEMath::Vector2i mPos;
+		AEMath::Recti    mBBox;
 
 	};