Merge branch 'master' of https://github.com/iAmAsval/FModel into master

This commit is contained in:
minshug 2020-10-11 21:23:38 +05:30
commit 7115e54458
3 changed files with 32 additions and 3 deletions

View File

@ -6,6 +6,8 @@ using SkiaSharp;
using SkiaSharp.HarfBuzz;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Documents;
namespace FModel.Creator.Bases
{
@ -184,6 +186,7 @@ namespace FModel.Creator.Bases
int x = 300;
if ((ELanguage)Properties.Settings.Default.AssetsLanguage == ELanguage.Arabic)
{
SKShaper shaper = new SKShaper(paint.Typeface);
float shapedTextWidth;
@ -201,8 +204,22 @@ namespace FModel.Creator.Bases
break;
}
}
if (text.Any(char.IsDigit))
{
int s = text.Count(k => Char.IsDigit(k));
//Draw Number Separately
c.DrawShapedText(shaper, text.Substring(text.Length - s), x, 155, paint);
c.DrawShapedText(shaper, text.Substring(0, text.Length - s), x + 60, 155, paint);
}
else
{
//feels bad man
c.DrawShapedText(shaper, text, x, 155, paint);
}
c.DrawShapedText(shaper, text, x, 155, paint);
}
else
{
@ -211,6 +228,7 @@ namespace FModel.Creator.Bases
paint.TextSize -= 2;
}
c.DrawText(text, x, 155, paint);
}
paint.Color = SKColors.White.WithAlpha(150);

View File

@ -3,6 +3,7 @@ using FModel.Creator.Texts;
using SkiaSharp;
using SkiaSharp.HarfBuzz;
using System;
using System.Linq;
namespace FModel.Creator.Bundles
{
@ -95,8 +96,19 @@ namespace FModel.Creator.Bundles
break;
}
}
if (text.Any(char.IsDigit))
{
int s = text.Count(k => Char.IsDigit(k));
c.DrawShapedText(shaper, text.Substring(text.Length - s), x, 155, paint);
c.DrawShapedText(shaper, text, x, 155, paint);
c.DrawShapedText(shaper, text.Substring(0, text.Length - s), x + 60, 155, paint);
}
else
{
//feels bad man
c.DrawShapedText(shaper, text, x, 155, paint);
}
}
else
{

View File

@ -427,7 +427,6 @@ It's now the most used free software to leak on Fortnite.</value>
<data name="Images" xml:space="preserve">
<value>الصور</value>
</data>
<data name="ImageSaved" xml:space="preserve">
<value>تم حفظ الصورة بنجاح</value>
</data>