Fix mouse move crash and font color bug

dpjudas · Jan 29, 2024 · f499e45 · f499e45
1 parent 3cd2446
commit f499e45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/canvas.cpp b/src/core/canvas.cpp
@@ -769,7 +769,7 @@ void BitmapCanvas::drawGlyph(CanvasTexture* texture, float left, float top, floa
 	uint32_t cgreen = (int32_t)clamp(color.g * 255.0f, 0.0f, 255.0f);
 	uint32_t cblue = (int32_t)clamp(color.b * 255.0f, 0.0f, 255.0f);
 #ifdef USE_SSE2
-	__m128i crgba = _mm_set_epi16(0, cblue, cgreen, cred, 0, cblue, cgreen, cred);
+	__m128i crgba = _mm_set_epi16(0, cred, cgreen, cblue, 0, cred, cgreen, cblue);
 #endif
 
 	float uscale = uvwidth / width;

diff --git a/src/core/widget.cpp b/src/core/widget.cpp
@@ -582,8 +582,10 @@ void Widget::OnWindowMouseMove(const Point& pos)
 		do
 		{
 			widget->OnMouseMove(widget->MapFrom(this, pos));
+			if (widget == this)
+				break;
 			widget = widget->Parent();
-		} while (widget != this);
+		} while (widget);
 	}
 }