소스 검색

Merge pull request #11034 from Gillibald/fixes/textIssues

[Text] fixes
github-merge-queue[bot] 2 년 전
부모
커밋
cfc063e958
2개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 1
      src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
  2. 7 5
      src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs

+ 1 - 1
src/Avalonia.Base/Media/TextFormatting/TextLayout.cs

@@ -174,7 +174,7 @@ namespace Avalonia.Media.TextFormatting
 
 
             foreach (var textLine in _textLines)
             foreach (var textLine in _textLines)
             {
             {
-                textLine.Draw(context, new Point(currentX + textLine.Start, currentY));
+                textLine.Draw(context, new Point(currentX, currentY));
 
 
                 currentY += textLine.Height;
                 currentY += textLine.Height;
             }
             }

+ 7 - 5
src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs

@@ -85,16 +85,18 @@ namespace Avalonia.Win32.Input
 
 
             _parent = parent;
             _parent = parent;
 
 
-            var langId= PRIMARYLANGID(LGID(HKL));
+            var langId = PRIMARYLANGID(LGID(HKL));
 
 
-            if(langId != _langId)
+            if (IsActive)
             {
             {
-                DisableImm();
+                if (langId != _langId)
+                {
+                    DisableImm();
+                    EnableImm();
+                }
             }
             }
 
 
             _langId = langId;
             _langId = langId;
-
-            EnableImm();
         }
         }
 
 
         public void ClearLanguageAndWindow()
         public void ClearLanguageAndWindow()