shiftos-archive/ShiftOS_TheReturn
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oced bug is slightly less of an issue

Browse source
This commit is contained in:
Michael 2017-08-07 13:46:04 -04:00
parent e07c2f58ba
commit 326d29db45
2 changed files with 35 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ShiftOS.Frontend/Apps/Terminal.cs
View file

@ -400,8 +400,14 @@ namespace ShiftOS.Frontend.Apps
}
//Draw the text
int textloc = 0 - (int)_vertOffset;
foreach (var line in Lines)
{
if(!(textloc < 0 || textloc - font.Height >= Height))
gfx.DrawString(line, 0, textloc, LoadedSkin.TerminalForeColorCC.ToColor().ToMonoColor(), font, Width - 4);
textloc += font.Height;
}
gfx.DrawString(Text, 0, (int)(0 - _vertOffset), LoadedSkin.TerminalForeColorCC.ToColor().ToMonoColor(), font, Width - 4);
}
}
@ -454,16 +460,8 @@ namespace ShiftOS.Frontend.Apps
{
public static SizeF SmartMeasureString(this Graphics gfx, string s, Font font, int width)
{
var textformat = new StringFormat(StringFormat.GenericTypographic);
textformat.FormatFlags |= StringFormatFlags.MeasureTrailingSpaces;
//textformat.Trimming = StringTrimming.Character;
//textformat.FormatFlags |= StringFormatFlags.NoClip;
gfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
var measure = gfx.MeasureString(s, font, width, textformat);
if (string.IsNullOrEmpty(s))
measure.Width = 0;
return new SizeF((float)Math.Ceiling(Math.Max(1,measure.Width)), (float)Math.Ceiling(Math.Max(1,measure.Height)));
var measure = System.Windows.Forms.TextRenderer.MeasureText(s, font, new Size(width, int.MaxValue));
return measure;
}
public static SizeF SmartMeasureString(this Graphics gfx, string s, Font font)

62
ShiftOS.Frontend/GraphicsSubsystem/GraphicsContext.cs
View file

@ -1,8 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using ShiftOS.Frontend.Apps;
@ -147,52 +149,38 @@ namespace ShiftOS.Frontend.GraphicsSubsystem
public void DrawString(string text, int x, int y, Color color, System.Drawing.Font font, int wrapWidth = 0)
{
if (string.IsNullOrEmpty(text))
return;
x += _startx;
y += _starty;
var fontcache = StringCaches.FirstOrDefault(z => z.Text == text && z.FontFamily == font&&z.WrapWidth == wrapWidth);
if (fontcache == null)
var measure = MeasureString(text, font, wrapWidth);
var cache = StringCaches.FirstOrDefault(z => z.Text == text && z.FontFamily == font && z.WrapWidth == wrapWidth);
if (cache == null)
{
Vector2 measure;
if (wrapWidth == 0)
measure = MeasureString(text, font);
else
measure = MeasureString(text, font, wrapWidth);
using(var bmp = new System.Drawing.Bitmap((int)measure.X, (int)measure.Y))
using (var bmp = new System.Drawing.Bitmap((int)measure.X, (int)measure.Y))
{
using(var gfx = System.Drawing.Graphics.FromImage(bmp))
using (var gfx = System.Drawing.Graphics.FromImage(bmp))
{
var sFormat = System.Drawing.StringFormat.GenericTypographic;
sFormat.FormatFlags |= System.Drawing.StringFormatFlags.NoClip;
gfx.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
gfx.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
gfx.PixelOffsetMode = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality;
gfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
gfx.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceOver;
gfx.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
gfx.DrawString(text, font, System.Drawing.Brushes.Black, new System.Drawing.RectangleF(0, 0, bmp.Width, bmp.Height), sFormat);
TextRenderer.DrawText(gfx, text, font, new System.Drawing.Point(0, 0), System.Drawing.Color.White);
}
var lck = bmp.LockBits(new System.Drawing.Rectangle(0, 0, bmp.Width, bmp.Height), System.Drawing.Imaging.ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
var data = new byte[Math.Abs(lck.Stride) * lck.Height];
System.Runtime.InteropServices.Marshal.Copy(lck.Scan0, data, 0, data.Length);
for (int i = 0; i < data.Length; i++)
if (i % 4 != 3)
data[i] = (byte)(255 - data[i]); // invert colours
var bytes = new byte[Math.Abs(lck.Stride) * lck.Height];
Marshal.Copy(lck.Scan0, bytes, 0, bytes.Length);
bmp.UnlockBits(lck);
var tex2 = new Texture2D(_graphicsDevice, bmp.Width, bmp.Height);
tex2.SetData<byte>(data);
fontcache = new TextCache();
fontcache.Text = text;
fontcache.FontFamily = font;
fontcache.WrapWidth = wrapWidth;
fontcache.Cache = tex2;
StringCaches.Add(fontcache);
tex2.SetData<byte>(bytes);
cache = new TextCache
{
Cache = tex2,
Text = text,
FontFamily = font,
WrapWidth = wrapWidth
};
StringCaches.Add(cache);
}
}
_spritebatch.Draw(fontcache.Cache, new Rectangle(x, y, fontcache.Cache.Width, fontcache.Cache.Height), color);
_spritebatch.Draw(cache.Cache, new Rectangle(x, y, cache.Cache.Width, cache.Cache.Height), color);
}
private float getRotation(float x, float y, float x2, float y2)
@ -208,6 +196,8 @@ namespace ShiftOS.Frontend.GraphicsSubsystem
}
}
public class TextCache
{
public string Text { get; set; }