aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms/Tools
diff options
context:
space:
mode:
Diffstat (limited to 'ShiftOS.WinForms/Tools')
-rw-r--r--ShiftOS.WinForms/Tools/ControlManager.cs200
-rw-r--r--ShiftOS.WinForms/Tools/DitheringEngine.cs231
2 files changed, 243 insertions, 188 deletions
diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs
index 3d66b2b..7fbfd1b 100644
--- a/ShiftOS.WinForms/Tools/ControlManager.cs
+++ b/ShiftOS.WinForms/Tools/ControlManager.cs
@@ -1,3 +1,4 @@
+
/*
* MIT License
*
@@ -136,84 +137,140 @@ namespace ShiftOS.WinForms.Tools
/// <param name="ctrl">The control to center (this is an extension method - you can call it on a control as though it was a method in that control)</param>
public static void CenterParent(this Control ctrl)
{
- ctrl.Location = new Point(
- (ctrl.Parent.Width - ctrl.Width) / 2,
- (ctrl.Parent.Height - ctrl.Height) / 2
- );
+ try
+ {
+ ctrl.Location = new Point(
+ (ctrl.Parent.Width - ctrl.Width) / 2,
+ (ctrl.Parent.Height - ctrl.Height) / 2
+ );
+ }
+ catch { }
}
public static void SetupControl(Control ctrl)
{
- Desktop.InvokeOnWorkerThread(new Action(() =>
- {
- ctrl.SuspendLayout();
- }));
- if (!(ctrl is MenuStrip) && !(ctrl is ToolStrip) && !(ctrl is StatusStrip) && !(ctrl is ContextMenuStrip))
+ Desktop.InvokeOnWorkerThread(() =>
{
- string tag = "";
-
- try
+ if (!(ctrl is MenuStrip) && !(ctrl is ToolStrip) && !(ctrl is StatusStrip) && !(ctrl is ContextMenuStrip))
{
- if(ctrl.Tag != null)
- tag = ctrl.Tag.ToString();
- }
- catch { }
+ string tag = "";
- if (!tag.Contains("keepbg"))
- {
- if (ctrl.BackColor != Control.DefaultBackColor)
+ try
+ {
+ if (ctrl.Tag != null)
+ tag = ctrl.Tag.ToString();
+ }
+ catch { }
+
+ if (!tag.Contains("ignoreal"))
+ {
+ ctrl.Click += (o, a) =>
+ {
+ Desktop.HideAppLauncher();
+ };
+
+ }
+
+ if (!tag.Contains("keepbg"))
{
- Desktop.InvokeOnWorkerThread(() =>
+ if (ctrl.BackColor != Control.DefaultBackColor)
{
ctrl.BackColor = SkinEngine.LoadedSkin.ControlColor;
- });
+ }
}
- }
- if (!tag.Contains("keepfont"))
- {
- Desktop.InvokeOnWorkerThread(() =>
+ if (!tag.Contains("keepfont"))
{
ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor;
ctrl.Font = SkinEngine.LoadedSkin.MainFont;
- });
- if (tag.Contains("header1"))
- {
- Desktop.InvokeOnWorkerThread(() =>
+ if (tag.Contains("header1"))
{
- ctrl.Font = SkinEngine.LoadedSkin.HeaderFont;
- });
- }
+ Desktop.InvokeOnWorkerThread(() =>
+ {
+ ctrl.Font = SkinEngine.LoadedSkin.HeaderFont;
+ });
+ }
- if (tag.Contains("header2"))
- {
- Desktop.InvokeOnWorkerThread(() =>
+ if (tag.Contains("header2"))
{
ctrl.Font = SkinEngine.LoadedSkin.Header2Font;
- });
+ }
+
+ if (tag.Contains("header3"))
+ {
+
+ ctrl.Font = SkinEngine.LoadedSkin.Header3Font;
+ }
+ }
+ try
+ {
+#if !SLOW_LOCALIZATION
+ if (!string.IsNullOrWhiteSpace(ctrl.Text))
+ {
+ string ctrlText = Localization.Parse(ctrl.Text);
+ ctrl.Text = ctrlText;
+ }
+#endif
+ }
+ catch
+ {
+
}
- if (tag.Contains("header3"))
+ if (ctrl is Button)
{
- Desktop.InvokeOnWorkerThread(() =>
+ Button b = ctrl as Button;
+ if (!tag.Contains("keepbg"))
{
+ b.BackColor = SkinEngine.LoadedSkin.ButtonBackgroundColor;
+ b.BackgroundImage = SkinEngine.GetImage("buttonidle");
+ b.BackgroundImageLayout = SkinEngine.GetImageLayout("buttonidle");
+ }
+ b.FlatAppearance.BorderSize = SkinEngine.LoadedSkin.ButtonBorderWidth;
+ if (!tag.Contains("keepfg"))
+ {
+ b.FlatAppearance.BorderColor = SkinEngine.LoadedSkin.ButtonForegroundColor;
+ b.ForeColor = SkinEngine.LoadedSkin.ButtonForegroundColor;
+ }
+ if (!tag.Contains("keepfont"))
+ b.Font = SkinEngine.LoadedSkin.ButtonTextFont;
- ctrl.Font = SkinEngine.LoadedSkin.Header3Font;
- });
+ Color orig_bg = b.BackColor;
+
+ b.MouseEnter += (o, a) =>
+ {
+ b.BackColor = SkinEngine.LoadedSkin.ButtonHoverColor;
+ b.BackgroundImage = SkinEngine.GetImage("buttonhover");
+ b.BackgroundImageLayout = SkinEngine.GetImageLayout("buttonhover");
+ };
+ b.MouseLeave += (o, a) =>
+ {
+ b.BackColor = orig_bg;
+ b.BackgroundImage = SkinEngine.GetImage("buttonidle");
+ b.BackgroundImageLayout = SkinEngine.GetImageLayout("buttonidle");
+ };
+ b.MouseUp += (o, a) =>
+ {
+ b.BackColor = orig_bg;
+ b.BackgroundImage = SkinEngine.GetImage("buttonidle");
+ b.BackgroundImageLayout = SkinEngine.GetImageLayout("buttonidle");
+ };
+
+ b.MouseDown += (o, a) =>
+ {
+ b.BackColor = SkinEngine.LoadedSkin.ButtonPressedColor;
+ b.BackgroundImage = SkinEngine.GetImage("buttonpressed");
+ b.BackgroundImageLayout = SkinEngine.GetImageLayout("buttonpressed");
+
+ };
}
}
- try
+
+ if (ctrl is TextBox)
{
- string ctrlText = Localization.Parse(ctrl.Text);
- Desktop.InvokeOnWorkerThread(() =>
- {
- ctrl.Text = ctrlText;
- });
+ (ctrl as TextBox).BorderStyle = BorderStyle.FixedSingle;
}
- catch
- {
- }
ctrl.KeyDown += (o, a) =>
{
if (a.Control && a.KeyCode == Keys.T)
@@ -229,28 +286,21 @@ namespace ShiftOS.WinForms.Tools
};
if (ctrl is Button)
{
- Desktop.InvokeOnWorkerThread(() =>
- {
- (ctrl as Button).FlatStyle = FlatStyle.Flat;
- });
+ (ctrl as Button).FlatStyle = FlatStyle.Flat;
}
else if (ctrl is WindowBorder)
{
- Desktop.InvokeOnWorkerThread(() =>
- {
- (ctrl as WindowBorder).Setup();
- });
+ (ctrl as WindowBorder).Setup();
}
- }
- Desktop.InvokeOnWorkerThread(() =>
- {
+
MakeDoubleBuffered(ctrl);
- ctrl.ResumeLayout();
+ ControlSetup?.Invoke(ctrl);
});
- ControlSetup?.Invoke(ctrl);
}
+
+
public static event Action<Control> ControlSetup;
public static void MakeDoubleBuffered(Control c)
@@ -270,30 +320,12 @@ namespace ShiftOS.WinForms.Tools
public static void SetupControls(Control frm, bool runInThread = true)
{
- SetupControl(frm);
- frm.Click += (o, a) =>
+ var ctrls = frm.Controls.ToList();
+ for (int i = 0; i < ctrls.Count(); i++)
{
- Desktop.HideAppLauncher();
- };
- ThreadStart ts = () =>
- {
- for (int i = 0; i < frm.Controls.Count; i++)
- {
- SetupControls(frm.Controls[i], false);
- }
-
- };
-
- if (runInThread == true)
- {
- var t = new Thread(ts);
- t.IsBackground = true;
- t.Start();
- }
- else
- {
- ts?.Invoke();
+ SetupControls(ctrls[i]);
}
+ SetupControl(frm);
}
}
diff --git a/ShiftOS.WinForms/Tools/DitheringEngine.cs b/ShiftOS.WinForms/Tools/DitheringEngine.cs
index 8509a0b..d042a40 100644
--- a/ShiftOS.WinForms/Tools/DitheringEngine.cs
+++ b/ShiftOS.WinForms/Tools/DitheringEngine.cs
@@ -33,6 +33,7 @@ using System.Drawing;
using System.Threading;
using ShiftOS.Engine;
using System.Runtime.InteropServices;
+using System.IO;
namespace ShiftOS.WinForms.Tools
{
@@ -101,7 +102,7 @@ namespace ShiftOS.WinForms.Tools
}
}
- public static void DitherColor(Color source, int width, int height, Action<Image> result)
+ public static Image DitherColor(Color source, int width, int height)
{
var bmp = new Bitmap(width + 1, height + 1);
var data = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), System.Drawing.Imaging.ImageLockMode.ReadWrite, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
@@ -115,7 +116,7 @@ namespace ShiftOS.WinForms.Tools
}
Marshal.Copy(rgb, 0, data.Scan0, rgb.Length);
bmp.UnlockBits(data);
- DitherImage(bmp, result);
+ return DitherImage(bmp);
}
@@ -225,16 +226,56 @@ namespace ShiftOS.WinForms.Tools
}
#endif
-#if FLOYDSTEINBERG
- public static void DitherImage(Image source, Action<Image> result)
+ public static int GetClosestColor(int gray, bool eightBits, bool sixBits, bool fourBits, bool twoBits)
{
- if (source == null)
+ int newgray = gray;
+ if (!eightBits)
{
- result?.Invoke(source);
- return;
+ if (sixBits)
+ {
+ newgray = gray >> 2;
+ }
+ else
+ {
+ if (fourBits)
+ {
+ newgray = (int)linear(gray, 0, 255, 0, 15) * 4;
+ }
+ else
+ {
+ if (twoBits)
+ {
+ if (gray > 127 + 63)
+ {
+ newgray = 255;
+ }
+ else if (gray > 127)
+ newgray = 127 + 63;
+ else if (gray > 63)
+ {
+ newgray = 127;
+ }
+ else if (gray > 0)
+ newgray = 63;
+ else
+ newgray = 0;
+ }
+ else
+ {
+ if (gray > 127)
+ newgray = 255;
+ else
+ newgray = 0;
+ }
+ }
+ }
}
+ return newgray;
+ }
-
+#if FLOYDSTEINBERG
+ public static Image DitherImage(Image source)
+ {
var bmp = new Bitmap(source.Width, source.Height);
var sourceBmp = (Bitmap)source;
var sourceLck = sourceBmp.LockBits(new Rectangle(0, 0, sourceBmp.Width, sourceBmp.Height), System.Drawing.Imaging.ImageLockMode.ReadWrite, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
@@ -266,122 +307,84 @@ namespace ShiftOS.WinForms.Tools
bool eightBits = Shiftorium.UpgradeInstalled("color_depth_8_bits");
bool color_depth_floydsteinberg = Shiftorium.UpgradeInstalled("color_depth_floyd-steinberg_dithering");
bool dithering = Shiftorium.UpgradeInstalled("color_depth_dithering");
-
- for (int y = 0; y < (destLck.Height); y++)
+ bool twentyfourbits = Shiftorium.UpgradeInstalled("color_depth_24_bits");
+ if (twentyfourbits)
+ {
+ sourceArr.CopyTo(destArr, 0);
+ }
+ else
{
- for (int x = 0; x < (Math.Abs(destLck.Stride)); x += 3)
- {
- int i = getIndexFromXY(x, y, width);
- byte red = sourceArr[i];
- byte green = sourceArr[i + 1];
- byte blue = sourceArr[i + 2];
-
- Color oldc = Color.FromArgb(red, green, blue);
- Color newc;
- if (sixteenBits)
- {
- newc = GetColor(oldc);
- }
- else
+ if (!sixteenBits)
+ {
+ if (dithering == true)
{
- int gray = ((oldc.R + oldc.G + oldc.B) / 3);
+ if (false == true)
+ {
- byte newgray = 0;
+ }
+ else
+ {
+ int error = 0;
+ for (int i = 0; i < destArr.Length; i += 3)
+ {
+ byte r = sourceArr[i];
+ byte g = sourceArr[i + 1];
+ byte b = sourceArr[i + 2];
- if (dithering && !color_depth_floydsteinberg)
- gray += error_r;
+ if (SkinEngine.LoadedSkin.SystemKey == Color.FromArgb(r, g, b))
+ {
+ destArr[i] = r;
+ destArr[i + 1] = g;
+ destArr[i + 2] = b;
+ continue;
+ }
+ int gray = (((r + g + b) / 3) + error);
+ int newgray = gray;
+ newgray = GetClosestColor(gray, eightBits, sixBits, fourBits, twoBits);
+ if (newgray > 255)
+ newgray = 255;
+ if (newgray < 0)
+ newgray = 0;
+ error = gray - newgray;
+ destArr[i] = (byte)newgray;
+ destArr[i + 1] = (byte)newgray;
+ destArr[i + 2] = (byte)newgray;
- if (eightBits)
- {
- newgray = (byte)gray;
- error_r = 0;
- }
- else if(sixBits)
- {
- newgray = (byte)(linear(gray, 0, 0xFF, 0, 0x3F) * 3);
- error_r = newgray - gray;
- }
- else if (fourBits)
- {
- newgray = (byte)(linear(gray, 0, 0xFF, 0, 0xF) * 0xF);
- error_r = newgray - gray;
- }
- else if (twoBits)
- {
- if (gray >= 191)
- newgray = 0xFF;
- else if (gray >= 127)
- newgray = Color.LightGray.R;
- else if (gray >= 64)
- newgray = Color.DarkGray.R;
- else
- newgray = 0x00;
- error_r = newgray - gray;
- }
- else
- {
- if (gray >= 127)
- newgray = 0xFF;
- else
- newgray = 0x00;
- error_r = newgray - gray;
+ }
}
- newc = Color.FromArgb(newgray, newgray, newgray);
}
- int nextIndex = getIndexFromXY(x + 3, y, width);
- int nextRow = getIndexFromXY(x, y + 1, width);
- int nextIndexOnNextRow = getIndexFromXY(x + 3, y + 1, width);
- int prevIndexOnNextRow = getIndexFromXY(x - 3, y + 1, width);
-
- grays[i] = newc.R;
- grays[i + 1] = newc.G;
- grays[i + 2] = newc.B;
-
- if (dithering)
+ else
{
- if (color_depth_floydsteinberg)
+ for (int i = 0; i < sourceArr.Length; i += 3)
{
- if (x + 3 < width)
+ byte r = sourceArr[i];
+ byte g = sourceArr[i + 1];
+ byte b = sourceArr[i + 2];
+ if (SkinEngine.LoadedSkin.SystemKey == Color.FromArgb(r, g, b))
{
- sourceArr[nextIndex] += (byte)((error_r * 7) / 16);
- sourceArr[nextIndex + 1] += (byte)((error_r * 7) / 16);
- sourceArr[nextIndex + 2] += (byte)((error_r * 7) / 16);
+ destArr[i] = r;
+ destArr[i + 1] = g;
+ destArr[i + 2] = b;
+ continue;
}
- if (y + 1 < height)
- {
- sourceArr[nextRow] += (byte)((error_r) / 16);
- sourceArr[nextRow + 1] += (byte)((error_r) / 16);
- sourceArr[nextRow + 2] += (byte)((error_r) / 16);
- }
- if (x + 3 < width && y + 1 < height)
- {
- sourceArr[nextIndexOnNextRow] += (byte)((error_r * 3) / 16);
- sourceArr[nextIndexOnNextRow + 1] += (byte)((error_r * 3) / 16);
- sourceArr[nextIndexOnNextRow + 2] += (byte)((error_r * 3) / 16);
- }
- if (x - 3 > 0 && y + 1 < height)
- {
- sourceArr[prevIndexOnNextRow] += (byte)((error_r * 5) / 16);
- sourceArr[prevIndexOnNextRow + 1] += (byte)((error_r * 5) / 16);
- sourceArr[prevIndexOnNextRow + 2] += (byte)((error_r * 5) / 16);
+ int gray = (r + g + b) / 3;
+ int newgray = GetClosestColor(gray, eightBits, sixBits, fourBits, twoBits);
+ destArr[i] = (byte)newgray;
+ destArr[i + 1] = (byte)newgray;
+ destArr[i + 2] = (byte)newgray;
+
+
- }
}
}
}
}
- for (int i = 0; i < destArr.Length - 3; i++)
- {
- destArr[i] = grays[i];
-
- }
-
Marshal.Copy(destArr, 0, destPtr, destBytes);
@@ -389,8 +392,7 @@ namespace ShiftOS.WinForms.Tools
- Desktop.InvokeOnWorkerThread(new Action(() => { result?.Invoke(bmp); }));
-
+ return bmp;
}
#endif
@@ -399,4 +401,25 @@ namespace ShiftOS.WinForms.Tools
return (width * y) + x;
}
}
+
+ public class DitheringSkinPostProcessor : ISkinPostProcessor
+ {
+ public byte[] ProcessImage(byte[] original)
+ {
+ try
+ {
+ var img = SkinEngine.ImageFromBinary(original);
+ var dithered = DitheringEngine.DitherImage(img);
+ using (var mstr = new MemoryStream())
+ {
+ dithered.Save(mstr, System.Drawing.Imaging.ImageFormat.Bmp);
+ return mstr.ToArray();
+ }
+ }
+ catch
+ {
+ return original;
+ }
+ }
+ }
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-04 18:22:34 +0000