auto hover event

RedRedStar/include/RRS/CommonType.h

@@ -22,6 +22,7 @@ namespace RRS {
 		Resize,
 		Focs,
 		Blur,
+		Click,
 		/// <summary>
 		/// 
 		/// </summary>

RedRedStar/include/RRS/Label.h

@@ -1,14 +1,17 @@
 #pragma once
 #include "Element.h"
+#include <string>
 class SkFont;
 namespace RRS {
 	class Label:public Element
 	{
 		public:
-			Label(const char* text);
+			Label(std::wstring&& text);
 			void Paint(SkCanvas* canvas) override;
-			const char* Text;
+			void SetFontColor(Color fontColor);
+			std::wstring Text;
 	private:
+		Color fontColor;
 		SkFont* font;
 		float advanceX;
 		float advanceY;

RedRedStar/include/RRS/Panel.h

@@ -16,9 +16,14 @@ namespace RRS {
 		void AddChildElement(std::shared_ptr<Element> element);
 		void SetBackgroundColor(Color color);
 		void SetBackgroundColorHover(Color color);
+		void SetBorderRadius(float borderRadius);
 	private:
+		void regMouseHoverEvent();
+		int hoverId=-1;
+		int hoverOffId = -1;
 		Color backgroundColor;
 		Color backgroundColorHover;
+		float borderRadius = 0.f;
 		/// <summary>
 		/// 
 		/// </summary>

RedRedStar/src/Button.cpp

@@ -2,7 +2,9 @@
 #include "../include/RRS/Panel.h"
 #include "../include/RRS/Label.h"
 #include "../include/RRS/Color.h"
+#include "../include/RRS/Window.h"
 #include "include/core/SkCanvas.h"
+#include <Windows.h>
 
 namespace RRS {
 	Button::Button() 
@@ -11,10 +13,17 @@ namespace RRS {
 		SetBackgroundColorHover(GetColor(28, 88, 156));
 		SetFlexDirection(FlexDirection::Column);
 		SetJustifyContent(JustifyContent::Center);
-		auto label = std::make_shared<Label>("Hello World");
+		this->SetBorderRadius(4.f);
+		auto label = std::make_shared<Label>(L"Hello ÊÀ½ç");
+		label->SetFontColor(GetColor(255, 255, 255));
 		label->SetAlignSelf(LayoutAlign::Center);
 		AddChildElement(label);	
-		SetSize(380, 120);
+		SetSize(label->GetWidth() + 50, 60);
+
+
+		AddEventListener(EventType::Click, [this](EventListener* arg) {
+			InvalidateRect(this->GetOwnerWindow()->Hwnd, nullptr, false);
+		});
 	}
 	Button::~Button()
 	{

RedRedStar/src/DisplayParams.h

@@ -9,7 +9,7 @@ namespace RRS {
         DisplayParams()
             : colorType(kN32_SkColorType)
             , fColorSpace(nullptr) 
-            , fMSAASampleCount(8)
+            , fMSAASampleCount(8)  //重要
             , fSurfaceProps(0, kRGB_H_SkPixelGeometry)
             , fDisableVsync(false)
             , fDelayDrawableAcquisition(false)

RedRedStar/src/Label.cpp

@@ -1,25 +1,32 @@
 #include "include/core/SkFont.h"
 #include "include/core/SkCanvas.h"
+#include "include/core/SkFontMgr.h"
 #include "../include/RRS/Label.h"
 #include "../include/RRS/Layout.h"
 #include "modules/skparagraph/include/TextStyle.h"
 namespace RRS {
-	Label::Label(const char* text):Text {text},font{new SkFont(nullptr,40)}
-	{
-		SkRect rect;
-		SkString str{ Text };
-		font->measureText(Text, strlen(Text), SkTextEncoding::kUTF8, &rect);
-		font->setSubpixel(true);
-		advanceX = rect.x();
-		advanceY = -rect.y();
-		SetSize(rect.width(), rect.height());
-	}
-	void Label::Paint(SkCanvas* canvas)
-	{
-		calculatePosition();
-		SkPaint paint;
-		paint.setColor(SK_ColorBLACK);
-		//paint.setAntiAlias(true);
-		canvas->drawString(Text, xAbsolute+advanceX, yAbsolute+advanceY, *font, paint);
-	}
+Label::Label(std::wstring&& text)
+	:Text {text}
+	,font{new SkFont(SkTypeface::MakeFromName("STSong", SkFontStyle::Normal()),20)} //Microsoft Yahei
+	,fontColor { GetColor(0, 0, 0) }
+{
+	SkRect rect;
+	font->measureText(Text.data(), wcslen(Text.data()) * 2, SkTextEncoding::kUTF16, &rect); //strlen(Text)
+	advanceX = rect.x();
+	advanceY = -rect.y();
+	SetSize(rect.width(), rect.height());
+}
+void Label::SetFontColor(Color fontColor)
+{
+	this->fontColor = fontColor;
+}
+void Label::Paint(SkCanvas* canvas)
+{
+	calculatePosition();
+	SkPaint paint;
+	paint.setColor(fontColor);
+	paint.setAntiAlias(true);
+	//canvas->drawString(SkString{ Text }, xAbsolute + advanceX, yAbsolute + advanceY, *font, paint);		
+	canvas->drawSimpleText(Text.data(), wcslen(Text.data()) * 2, SkTextEncoding::kUTF16, xAbsolute + advanceX, yAbsolute + advanceY, *font, paint);
+}
 }

RedRedStar/src/Panel.cpp

@@ -6,38 +6,70 @@
 
 namespace RRS {
 	Panel::Panel()
+		:backgroundColor { GetColor(255, 255, 255) }
+		,backgroundColorHover { GetColor(255, 255, 255) }
 	{
-		AddEventListener(EventType::MouseOver, [this](EventListener* arg) {
-			//InvalidateRect(OwnerWindow->Hwnd, nullptr, false);
-		});
-		AddEventListener(EventType::MouseOut, [this](EventListener* arg) {
-			//InvalidateRect(OwnerWindow->Hwnd, nullptr, false);
-		});
+
 	}
 	Panel::~Panel()
 	{
 	}
+	void Panel::regMouseHoverEvent()
+	{
+		if (backgroundColor != backgroundColorHover && hoverId == -1 && hoverOffId == -1) {
+			hoverId = AddEventListener(EventType::MouseOver, [this](EventListener* arg) {
+				InvalidateRect(this->GetOwnerWindow()->Hwnd, nullptr, false);
+				});
+			hoverOffId = AddEventListener(EventType::MouseOut, [this](EventListener* arg) {
+				InvalidateRect(this->GetOwnerWindow()->Hwnd, nullptr, false);
+				});
+		}
+		if (backgroundColor == backgroundColorHover && hoverId != -1 && hoverOffId != -1)
+		{
+			RemoveEventListener(EventType::MouseOver, hoverId);
+			RemoveEventListener(EventType::MouseOver, hoverOffId);
+			hoverId = -1;
+			hoverOffId = -1;
+		}
+	}
 	void Panel::SetBackgroundColor(Color color)
 	{
-		if (backgroundColor != color) {
+		if (backgroundColor != color) 
+		{
 			backgroundColor = color;
+			regMouseHoverEvent();
 		}
+
 	}
 	void Panel::SetBackgroundColorHover(Color color)
 	{
 		if (backgroundColorHover != color) 
 		{
 			backgroundColorHover = color;
+			regMouseHoverEvent();
 		}
 	}
+
+	void Panel::SetBorderRadius(float borderRadius)
+	{
+		this->borderRadius = borderRadius;
+	}
 	void Panel::Paint(SkCanvas* canvas)
 	{
 		calculatePosition();
 		SkPaint paint;
+		paint.setAntiAlias(true);
 		paint.setColor(GetIsMouseEnter()?backgroundColor:backgroundColorHover);
 		paint.setStrokeJoin(SkPaint::Join::kRound_Join);
 		SkRect rect = SkRect::MakeXYWH(xAbsolute, yAbsolute, GetWidth(), GetHeight());
-		canvas->drawRoundRect(rect, 12.0, 12.0, paint);
+		if (borderRadius != 0.f) {
+			canvas->drawRoundRect(rect, borderRadius, borderRadius, paint);
+		}
+		else
+		{
+			canvas->drawRect(rect, paint);
+		}
+
 		for (auto element : children)
 		{
 			element->Paint(canvas);