mirror of
https://github.com/Stone-Red-Code/DesktopMagic.git
synced 2026-09-04 23:39:29 +02:00
Update project to .NET 8 and code improvements
This commit is contained in:
Stone_Red
@@ -1,26 +1,33 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace DesktopMagicPluginAPI.Drawing
|
||||
namespace DesktopMagicPluginAPI.Drawing;
|
||||
|
||||
internal class FontComparer : IEqualityComparer<Font>
|
||||
{
|
||||
internal class FontComparer : IEqualityComparer<Font>
|
||||
public bool Equals(Font font1, Font font2)
|
||||
{
|
||||
public bool Equals(Font font1, Font font2)
|
||||
if (font1.Name != font2.Name)
|
||||
{
|
||||
if (font1.Name != font2.Name) return false;
|
||||
if (font1.SizeInPoints != font2.SizeInPoints) return false;
|
||||
if (font1.Style != font2.Style) return false;
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
public int GetHashCode([DisallowNull] Font obj)
|
||||
if (font1.SizeInPoints != font2.SizeInPoints)
|
||||
{
|
||||
return obj.GetHashCode();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (font1.Style != font2.Style)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public int GetHashCode([DisallowNull] Font obj)
|
||||
{
|
||||
return obj.GetHashCode();
|
||||
}
|
||||
}
|
||||
@@ -2,184 +2,183 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
|
||||
namespace DesktopMagicPluginAPI.Drawing
|
||||
namespace DesktopMagicPluginAPI.Drawing;
|
||||
|
||||
/// <summary>
|
||||
/// Extensions for the <see cref="Graphics"/> class.
|
||||
/// </summary>
|
||||
public static class GraphicsExtentions
|
||||
{
|
||||
private static readonly Dictionary<Font, int> fonts = new Dictionary<Font, int>(new FontComparer());
|
||||
|
||||
/// <summary>
|
||||
/// Extensions for the <see cref="Graphics"/> class.
|
||||
/// <inheritdoc cref="Graphics.DrawString(string?, Font, Brush, float, float)"/>
|
||||
/// </summary>
|
||||
public static class GraphicsExtentions
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="x">The x-coordinate of the upper-left corner of the drawn text.</param>
|
||||
/// <param name="y">The y-coordinate of the upper-left corner of the drawn text.</param>
|
||||
public static void DrawStringMonospace(this Graphics graphics, string s, Font font, Brush brush, float x, float y)
|
||||
{
|
||||
private static readonly Dictionary<Font, int> fonts = new Dictionary<Font, int>(new FontComparer());
|
||||
int widest = graphics.GetWidestChar(font);
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.DrawString(string?, Font, Brush, float, float)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="x">The x-coordinate of the upper-left corner of the drawn text.</param>
|
||||
/// <param name="y">The y-coordinate of the upper-left corner of the drawn text.</param>
|
||||
public static void DrawStringMonospace(this Graphics graphics, string s, Font font, Brush brush, float x, float y)
|
||||
for (int i = 0; i < s.Length; i++)
|
||||
{
|
||||
int widest = graphics.GetWidestChar(font);
|
||||
graphics.DrawString(s[i].ToString(), font, brush, x, y);
|
||||
|
||||
for (int i = 0; i < s.Length; i++)
|
||||
{
|
||||
graphics.DrawString(s[i].ToString(), font, brush, x, y);
|
||||
|
||||
x += widest;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.DrawString(string?, Font, Brush, PointF)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="point"><see cref="PointF"/> structure that specifies the upper-left corner of the drawn text.</param>
|
||||
public static void DrawStringMonospace(this Graphics graphics, string s, Font font, Brush brush, PointF point)
|
||||
{
|
||||
int widest = graphics.GetWidestChar(font);
|
||||
|
||||
for (int i = 0; i < s.Length; i++)
|
||||
{
|
||||
graphics.DrawString(s[i].ToString(), font, brush, point);
|
||||
|
||||
point.X += widest;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.DrawString(string?, Font, Brush, float, float)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="x">The x-coordinate of the upper-left corner of the drawn text.</param>
|
||||
/// <param name="y">The y-coordinate of the upper-left corner of the drawn text.</param>
|
||||
/// /// <param name="width">The specified width.</param>
|
||||
public static void DrawStringFixedWidth(this Graphics graphics, string s, Font font, Brush brush, float x, float y, float width)
|
||||
{
|
||||
for (int i = 0; i < s.Length; i++)
|
||||
{
|
||||
graphics.DrawString(s[i].ToString(), font, brush, x, y);
|
||||
|
||||
x += width;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.DrawString(string?, Font, Brush, PointF)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="point"><see cref="PointF"/> structure that specifies the upper-left corner of the drawn text.</param>
|
||||
/// <param name="width">The specified width.</param>
|
||||
public static void DrawStringFixedWidth(this Graphics graphics, string s, Font font, Brush brush, PointF point, float width)
|
||||
{
|
||||
for (int i = 0; i < s.Length; i++)
|
||||
{
|
||||
graphics.DrawString(s[i].ToString(), font, brush, point);
|
||||
|
||||
point.X += width;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///<inheritdoc cref="Graphics.DrawString(string?, Font, Brush, float, float)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="x">The x-coordinate of the upper-left corner of the drawn text.</param>
|
||||
/// <param name="y">The y-coordinate of the upper-left corner of the drawn text.</param>
|
||||
public static void DrawStringNoLeftPadding(this Graphics graphics, string s, Font font, Brush brush, float x, float y)
|
||||
{
|
||||
// measure left padding
|
||||
StringFormat sf = new StringFormat(StringFormatFlags.NoClip);
|
||||
sf.SetMeasurableCharacterRanges(new CharacterRange[] { new CharacterRange(0, 1) });
|
||||
Region[] r = graphics.MeasureCharacterRanges(s, font, new RectangleF(0, 0, 1000, 100), sf);
|
||||
float leftPadding = r[0].GetBounds(graphics).Left;
|
||||
|
||||
// draw string
|
||||
sf = new StringFormat(StringFormatFlags.NoClip);
|
||||
graphics.DrawString(s, font, brush, x - leftPadding, y, sf);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.DrawString(string?, Font, Brush, PointF)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="point"><see cref="PointF"/> structure that specifies the upper-left corner of the drawn text.</param>
|
||||
public static void DrawStringNoLeftPadding(this Graphics graphics, string s, Font font, Brush brush, PointF point)
|
||||
{
|
||||
// measure left padding
|
||||
StringFormat sf = new StringFormat(StringFormatFlags.NoClip);
|
||||
sf.SetMeasurableCharacterRanges(new CharacterRange[] { new CharacterRange(0, 1) });
|
||||
Region[] r = graphics.MeasureCharacterRanges(s, font, new RectangleF(0, 0, 1000, 100), sf);
|
||||
float leftPadding = r[0].GetBounds(graphics).Left;
|
||||
|
||||
// draw string
|
||||
sf = new StringFormat(StringFormatFlags.NoClip);
|
||||
graphics.DrawString(s, font, brush, point.X - leftPadding, point.Y, sf);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.MeasureString(string, Font)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="text">String to measure.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <returns></returns>
|
||||
public static SizeF MeasureStringNoLeftPadding(this Graphics graphics, string text, Font font)
|
||||
{
|
||||
SizeF size = graphics.MeasureString(text, font, int.MaxValue);
|
||||
|
||||
StringFormat sf = new StringFormat(StringFormatFlags.NoClip);
|
||||
sf.SetMeasurableCharacterRanges(new CharacterRange[] { new CharacterRange(0, 1) });
|
||||
Region[] r = graphics.MeasureCharacterRanges(text, font, new RectangleF(0, 0, 1000, 100), sf);
|
||||
float leftPadding = r[0].GetBounds(graphics).Left;
|
||||
|
||||
size.Width -= leftPadding / 1.5f;
|
||||
return size;
|
||||
}
|
||||
|
||||
private static int GetWidestChar(this Graphics graphics, Font font)
|
||||
{
|
||||
if (fonts.ContainsKey(font))
|
||||
{
|
||||
return fonts[font];
|
||||
}
|
||||
|
||||
float max = 0;
|
||||
char maxx = ' ';
|
||||
for (int i = 0; i <= 255; i++)
|
||||
{
|
||||
char c = (char)i;
|
||||
if (char.IsLetterOrDigit(c))
|
||||
{
|
||||
float neww = graphics.MeasureString(c.ToString(), font).Width;
|
||||
if (neww >= max)
|
||||
{
|
||||
max = neww;
|
||||
maxx = c;
|
||||
}
|
||||
}
|
||||
}
|
||||
Console.WriteLine((int)Math.Round(max, 0));
|
||||
Console.WriteLine(maxx);
|
||||
fonts.Add(font, (int)Math.Round(max, 0));
|
||||
return (int)Math.Round(max, 0);
|
||||
x += widest;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.DrawString(string?, Font, Brush, PointF)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="point"><see cref="PointF"/> structure that specifies the upper-left corner of the drawn text.</param>
|
||||
public static void DrawStringMonospace(this Graphics graphics, string s, Font font, Brush brush, PointF point)
|
||||
{
|
||||
int widest = graphics.GetWidestChar(font);
|
||||
|
||||
for (int i = 0; i < s.Length; i++)
|
||||
{
|
||||
graphics.DrawString(s[i].ToString(), font, brush, point);
|
||||
|
||||
point.X += widest;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.DrawString(string?, Font, Brush, float, float)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="x">The x-coordinate of the upper-left corner of the drawn text.</param>
|
||||
/// <param name="y">The y-coordinate of the upper-left corner of the drawn text.</param>
|
||||
/// /// <param name="width">The specified width.</param>
|
||||
public static void DrawStringFixedWidth(this Graphics graphics, string s, Font font, Brush brush, float x, float y, float width)
|
||||
{
|
||||
for (int i = 0; i < s.Length; i++)
|
||||
{
|
||||
graphics.DrawString(s[i].ToString(), font, brush, x, y);
|
||||
|
||||
x += width;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.DrawString(string?, Font, Brush, PointF)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="point"><see cref="PointF"/> structure that specifies the upper-left corner of the drawn text.</param>
|
||||
/// <param name="width">The specified width.</param>
|
||||
public static void DrawStringFixedWidth(this Graphics graphics, string s, Font font, Brush brush, PointF point, float width)
|
||||
{
|
||||
for (int i = 0; i < s.Length; i++)
|
||||
{
|
||||
graphics.DrawString(s[i].ToString(), font, brush, point);
|
||||
|
||||
point.X += width;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///<inheritdoc cref="Graphics.DrawString(string?, Font, Brush, float, float)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="x">The x-coordinate of the upper-left corner of the drawn text.</param>
|
||||
/// <param name="y">The y-coordinate of the upper-left corner of the drawn text.</param>
|
||||
public static void DrawStringNoLeftPadding(this Graphics graphics, string s, Font font, Brush brush, float x, float y)
|
||||
{
|
||||
// measure left padding
|
||||
StringFormat sf = new StringFormat(StringFormatFlags.NoClip);
|
||||
sf.SetMeasurableCharacterRanges([new CharacterRange(0, 1)]);
|
||||
Region[] r = graphics.MeasureCharacterRanges(s, font, new RectangleF(0, 0, 1000, 100), sf);
|
||||
float leftPadding = r[0].GetBounds(graphics).Left;
|
||||
|
||||
// draw string
|
||||
sf = new StringFormat(StringFormatFlags.NoClip);
|
||||
graphics.DrawString(s, font, brush, x - leftPadding, y, sf);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.DrawString(string?, Font, Brush, PointF)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="s">String to draw.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <param name="brush"><see cref="Brush"/> that determines the color and texture of the drawn text.</param>
|
||||
/// <param name="point"><see cref="PointF"/> structure that specifies the upper-left corner of the drawn text.</param>
|
||||
public static void DrawStringNoLeftPadding(this Graphics graphics, string s, Font font, Brush brush, PointF point)
|
||||
{
|
||||
// measure left padding
|
||||
StringFormat sf = new StringFormat(StringFormatFlags.NoClip);
|
||||
sf.SetMeasurableCharacterRanges([new CharacterRange(0, 1)]);
|
||||
Region[] r = graphics.MeasureCharacterRanges(s, font, new RectangleF(0, 0, 1000, 100), sf);
|
||||
float leftPadding = r[0].GetBounds(graphics).Left;
|
||||
|
||||
// draw string
|
||||
sf = new StringFormat(StringFormatFlags.NoClip);
|
||||
graphics.DrawString(s, font, brush, point.X - leftPadding, point.Y, sf);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <inheritdoc cref="Graphics.MeasureString(string, Font)"/>
|
||||
/// </summary>
|
||||
/// <param name="graphics">Graphics object.</param>
|
||||
/// <param name="text">String to measure.</param>
|
||||
/// <param name="font"><see cref="Font"/> that defines the text format of the string.</param>
|
||||
/// <returns></returns>
|
||||
public static SizeF MeasureStringNoLeftPadding(this Graphics graphics, string text, Font font)
|
||||
{
|
||||
SizeF size = graphics.MeasureString(text, font, int.MaxValue);
|
||||
|
||||
StringFormat sf = new StringFormat(StringFormatFlags.NoClip);
|
||||
sf.SetMeasurableCharacterRanges([new CharacterRange(0, 1)]);
|
||||
Region[] r = graphics.MeasureCharacterRanges(text, font, new RectangleF(0, 0, 1000, 100), sf);
|
||||
float leftPadding = r[0].GetBounds(graphics).Left;
|
||||
|
||||
size.Width -= leftPadding / 1.5f;
|
||||
return size;
|
||||
}
|
||||
|
||||
private static int GetWidestChar(this Graphics graphics, Font font)
|
||||
{
|
||||
if (fonts.TryGetValue(font, out int value))
|
||||
{
|
||||
return value;
|
||||
}
|
||||
|
||||
float max = 0;
|
||||
char maxx = ' ';
|
||||
for (int i = 0; i <= 255; i++)
|
||||
{
|
||||
char c = (char)i;
|
||||
if (char.IsLetterOrDigit(c))
|
||||
{
|
||||
float neww = graphics.MeasureString(c.ToString(), font).Width;
|
||||
if (neww >= max)
|
||||
{
|
||||
max = neww;
|
||||
maxx = c;
|
||||
}
|
||||
}
|
||||
}
|
||||
Console.WriteLine((int)Math.Round(max, 0));
|
||||
Console.WriteLine(maxx);
|
||||
fonts.Add(font, (int)Math.Round(max, 0));
|
||||
return (int)Math.Round(max, 0);
|
||||
}
|
||||
}
|
||||
@@ -1,29 +1,22 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
namespace DesktopMagicPluginAPI.Drawing;
|
||||
|
||||
namespace DesktopMagicPluginAPI.Drawing
|
||||
/// <summary>
|
||||
/// Specifies which render quality is used to display the bitmap images.
|
||||
/// </summary>
|
||||
public enum RenderQuality
|
||||
{
|
||||
/// <summary>
|
||||
/// Specifies which render quality is used to display the bitmap images.
|
||||
/// Slower then <see cref="Low"/> but produces higher quality output.
|
||||
/// </summary>
|
||||
public enum RenderQuality
|
||||
{
|
||||
/// <summary>
|
||||
/// Slower then <see cref="Low"/> but produces higher quality output.
|
||||
/// </summary>
|
||||
High,
|
||||
High,
|
||||
|
||||
/// <summary>
|
||||
/// Faster then <see cref="High"/> but produces lower quality output.
|
||||
/// </summary>
|
||||
Low,
|
||||
/// <summary>
|
||||
/// Faster then <see cref="High"/> but produces lower quality output.
|
||||
/// </summary>
|
||||
Low,
|
||||
|
||||
/// <summary>
|
||||
/// Provides performance benefits over <see cref="Low"/>
|
||||
/// </summary>
|
||||
Performance
|
||||
}
|
||||
/// <summary>
|
||||
/// Provides performance benefits over <see cref="Low"/>
|
||||
/// </summary>
|
||||
Performance
|
||||
}
|
||||
Reference in New Issue
Block a user