Merge pull request #170 from hustbeef/master

Fixed: update font property in Canvas.TextOut
XusinboyBekchanov · May 6, 2024 · 17b1435 · 17b1435
2 parents eb0f448 + 5ac8683
commit 17b1435
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/mff/PagePanel.bas b/mff/PagePanel.bas
@@ -197,7 +197,10 @@ Namespace My.Sys.Forms
 						End Select
 					End With
 				End If
-				If ShowCaption Then  Canvas.TextOut(Current.X, Current.Y, FText, Font.Color, FBackColor)
+				If ShowCaption Then
+					SelectObject(Canvas.Handle, Canvas.Font.Handle)
+					Canvas.TextOut(Current.X, Current.Y, FText, Font.Color, FBackColor)
+				End If
 				If OnPaint Then OnPaint(*Designer, This, Canvas)
 				If DoubleBuffered Then
 					BitBlt(Dc, 0, 0, R.Right - R.left, R.Bottom - R.top, memDC, 0, 0, SRCCOPY)

diff --git a/mff/Picture.bas b/mff/Picture.bas
@@ -264,7 +264,10 @@ Namespace My.Sys.Forms
 						End Select
 					End With
 				End If
-				If ShowCaption Then  Canvas.TextOut(Current.X, Current.Y, FText, Font.Color, FBackColor)
+				If ShowCaption Then
+					SelectObject(Canvas.Handle, Canvas.Font.Handle)
+					Canvas.TextOut(Current.X, Current.Y, FText, Font.Color, FBackColor)
+				End If
 				If OnPaint Then OnPaint(*Designer, This, Canvas)
 				If DoubleBuffered Then
 					BitBlt(Dc, 0, 0, R.Right - R.left, R.Bottom - R.top, memDC, 0, 0, SRCCOPY)