Merge branch 'main' into align-naming

dotnet · Jun 2, 2023 · 2d4cc8f · 2d4cc8f
2 parents 86c59ca + bd4e6a6
commit 2d4cc8f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/src/GraphicsControls/Handlers/Editor/EditorHandler.Android.cs b/src/GraphicsControls/Handlers/Editor/EditorHandler.Android.cs
@@ -20,17 +20,17 @@ protected override GraphicsEditor CreatePlatformView()
 				ImeOptions = ImeAction.Done
 			};
 
-            platformView.SetSingleLine(false);
-            platformView.Gravity = GravityFlags.Top;
-            platformView.TextAlignment = ATextAlignment.ViewStart;
-            platformView.SetHorizontallyScrolling(false);
-
-			if (Drawable is MaterialEditorDrawable)
-                platformView.SetPadding(12, 18, 0, 0);
-            else if (Drawable is FluentEditorDrawable)
-                platformView.SetPadding(12, 12, 0, 0);
-			else if (Drawable is CupertinoEditorDrawable)
-                platformView.SetPadding(12, 12, 0, 0);
+      platformView.SetSingleLine(false);
+      platformView.Gravity = GravityFlags.Top;
+      platformView.TextAlignment = ATextAlignment.ViewStart;
+      platformView.SetHorizontallyScrolling(false);
+
+      if (Drawable is MaterialEditorDrawable)
+        platformView.SetPadding((int)(density * 12), (int)(density * 24), 0, 0);
+      else if (Drawable is FluentEditorDrawable)
+        platformView.SetPadding((int)(density * 12), (int)(density * 12), 0, 0);
+      else if (Drawable is CupertinoEditorDrawable)
+        platformView.SetPadding((int)(density * 12), (int)(density * 12), 0, 0);
 
 			return platformView;
 		}

diff --git a/src/GraphicsControls/Handlers/Entry/EntryHandler.Android.cs b/src/GraphicsControls/Handlers/Entry/EntryHandler.Android.cs
@@ -22,14 +22,16 @@ protected override GraphicsEntry CreatePlatformView()
             {
                 GraphicsControl = this
             };
+
+            var density = platformView.Resources?.DisplayMetrics?.Density ?? 1.0f;
 
             if (Drawable is MaterialEntryDrawable)
-                platformView.SetPadding(12, 18, 0, 0);
+                platformView.SetPadding((int)(density * 12), (int)(density * 24), 0, 0);
             else if (Drawable is FluentEntryDrawable)
-                platformView.SetPadding(12, 12, 0, 0);
+                platformView.SetPadding((int)(density * 12), (int)(density * 12), 0, 0);
             else if (Drawable is CupertinoEntryDrawable)
-                platformView.SetPadding(12, 12, 0, 0);
-
+                platformView.SetPadding((int)(density * 12), (int)(density * 12), 0, 0);
+                
             return platformView;
         }