CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

Fix transparent color issues in theme

Browse source
This commit is contained in:
Jaex 2020-09-30 00:52:20 +03:00
parent 955ae9128b
commit dcdf0d46f9
6 changed files with 55 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HelpersLib/Colors/GradientInfo.cs
View file

@ -47,7 +47,7 @@ public class GradientInfo
public bool IsVisible => IsValid && Colors.Any(x => x.Color.A > 0);
[JsonIgnore]
public bool IsTransparent => IsValid && Colors.Any(x => x.Color.A < 255);
public bool IsTransparent => IsValid && Colors.Any(x => x.Color.IsTransparent());
public GradientInfo()
{

2
ShareX.HelpersLib/Controls/ColorButton.cs
View file

@ -120,7 +120,7 @@ protected override void OnPaint(PaintEventArgs pevent)
Graphics g = pevent.Graphics;
if (Color.A < 255)
if (Color.IsTransparent())
{
using (Image checker = ImageHelpers.CreateCheckerPattern(boxSize, boxSize))
{

5
ShareX.HelpersLib/Extensions/Extensions.cs
View file

@ -839,5 +839,10 @@ public static IEnumerable<TreeNode> All(this TreeNodeCollection nodes)
}
}
}
public static bool IsTransparent(this Color color)
{
return color.A < 255;
}
}
}

2
ShareX.HelpersLib/Helpers/ImageHelpers.cs
View file

@ -1972,7 +1972,7 @@ public static Bitmap CreateColorPickerIcon(Color color, Rectangle rect, int hole
public static void DrawColorPickerIcon(Graphics g, Color color, Rectangle rect, int holeSize = 0)
{
if (color.A < 255)
if (color.IsTransparent())
{
using (Image checker = CreateCheckerPattern(rect.Width / 2, rect.Height / 2))
{

94
ShareX.HelpersLib/ShareXTheme.cs
View file

@ -45,7 +45,7 @@ public Color BackgroundColor
}
set
{
if (!value.IsEmpty) backgroundColor = value;
if (!value.IsTransparent()) backgroundColor = value;
}
}
@ -60,7 +60,7 @@ public Color LightBackgroundColor
}
set
{
if (!value.IsEmpty) lightBackgroundColor = value;
if (!value.IsTransparent()) lightBackgroundColor = value;
}
}
@ -75,7 +75,7 @@ public Color DarkBackgroundColor
}
set
{
if (!value.IsEmpty) darkBackgroundColor = value;
if (!value.IsTransparent()) darkBackgroundColor = value;
}
}
@ -90,7 +90,7 @@ public Color TextColor
}
set
{
if (!value.IsEmpty) textColor = value;
if (!value.IsTransparent()) textColor = value;
}
}
@ -105,7 +105,7 @@ public Color BorderColor
}
set
{
if (!value.IsEmpty) borderColor = value;
if (!value.IsTransparent()) borderColor = value;
}
}
@ -150,59 +150,57 @@ public Color BorderColor
public ShareXTheme()
{
SetDarkTheme();
}
public static ShareXTheme GetDarkTheme()
public void SetDarkTheme()
{
return new ShareXTheme()
{
Name = "Dark",
BackgroundColor = Color.FromArgb(42, 47, 56),
LightBackgroundColor = Color.FromArgb(52, 57, 65),
DarkBackgroundColor = Color.FromArgb(28, 32, 38),
TextColor = Color.FromArgb(235, 235, 235),
BorderColor = Color.FromArgb(28, 32, 38),
CheckerColor = Color.FromArgb(60, 60, 60),
CheckerColor2 = Color.FromArgb(50, 50, 50),
CheckerSize = 15,
LinkColor = Color.FromArgb(166, 212, 255),
MenuHighlightColor = Color.FromArgb(30, 34, 40),
MenuHighlightBorderColor = Color.FromArgb(116, 129, 152),
MenuBorderColor = Color.FromArgb(22, 26, 31),
MenuCheckBackgroundColor = Color.FromArgb(56, 64, 75),
ContextMenuOpacity = 100,
SeparatorLightColor = Color.FromArgb(56, 64, 75),
SeparatorDarkColor = Color.FromArgb(22, 26, 31)
};
Name = "Dark";
BackgroundColor = Color.FromArgb(42, 47, 56);
LightBackgroundColor = Color.FromArgb(52, 57, 65);
DarkBackgroundColor = Color.FromArgb(28, 32, 38);
TextColor = Color.FromArgb(235, 235, 235);
BorderColor = Color.FromArgb(28, 32, 38);
CheckerColor = Color.FromArgb(60, 60, 60);
CheckerColor2 = Color.FromArgb(50, 50, 50);
CheckerSize = 15;
LinkColor = Color.FromArgb(166, 212, 255);
MenuHighlightColor = Color.FromArgb(30, 34, 40);
MenuHighlightBorderColor = Color.FromArgb(116, 129, 152);
MenuBorderColor = Color.FromArgb(22, 26, 31);
MenuCheckBackgroundColor = Color.FromArgb(56, 64, 75);
ContextMenuOpacity = 100;
SeparatorLightColor = Color.FromArgb(56, 64, 75);
SeparatorDarkColor = Color.FromArgb(22, 26, 31);
}
public static ShareXTheme GetLightTheme()
public void SetLightTheme()
{
return new ShareXTheme()
{
Name = "Light",
BackgroundColor = Color.FromArgb(242, 242, 242),
LightBackgroundColor = Color.FromArgb(247, 247, 247),
DarkBackgroundColor = Color.FromArgb(235, 235, 235),
TextColor = Color.FromArgb(69, 69, 69),
BorderColor = Color.FromArgb(201, 201, 201),
CheckerColor = Color.FromArgb(247, 247, 247),
CheckerColor2 = Color.FromArgb(235, 235, 235),
CheckerSize = 15,
LinkColor = Color.FromArgb(166, 212, 255),
MenuHighlightColor = Color.FromArgb(247, 247, 247),
MenuHighlightBorderColor = Color.FromArgb(96, 143, 226),
MenuBorderColor = Color.FromArgb(201, 201, 201),
MenuCheckBackgroundColor = Color.FromArgb(225, 233, 244),
ContextMenuOpacity = 100,
SeparatorLightColor = Color.FromArgb(253, 253, 253),
SeparatorDarkColor = Color.FromArgb(189, 189, 189)
};
Name = "Light";
BackgroundColor = Color.FromArgb(242, 242, 242);
LightBackgroundColor = Color.FromArgb(247, 247, 247);
DarkBackgroundColor = Color.FromArgb(235, 235, 235);
TextColor = Color.FromArgb(69, 69, 69);
BorderColor = Color.FromArgb(201, 201, 201);
CheckerColor = Color.FromArgb(247, 247, 247);
CheckerColor2 = Color.FromArgb(235, 235, 235);
CheckerSize = 15;
LinkColor = Color.FromArgb(166, 212, 255);
MenuHighlightColor = Color.FromArgb(247, 247, 247);
MenuHighlightBorderColor = Color.FromArgb(96, 143, 226);
MenuBorderColor = Color.FromArgb(201, 201, 201);
MenuCheckBackgroundColor = Color.FromArgb(225, 233, 244);
ContextMenuOpacity = 100;
SeparatorLightColor = Color.FromArgb(253, 253, 253);
SeparatorDarkColor = Color.FromArgb(189, 189, 189);
}
public static List<ShareXTheme> GetPresets()
{
return new List<ShareXTheme>() { GetDarkTheme(), GetLightTheme() };
ShareXTheme darkTheme = new ShareXTheme();
ShareXTheme lightTheme = new ShareXTheme();
lightTheme.SetLightTheme();
return new List<ShareXTheme>() { darkTheme, lightTheme };
}
public override string ToString()

2
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -481,7 +481,7 @@ private void CbThemes_SelectedIndexChanged(object sender, EventArgs e)
private void BtnThemeAdd_Click(object sender, EventArgs e)
{
ShareXTheme theme = ShareXTheme.GetDarkTheme();
ShareXTheme theme = new ShareXTheme();
AddTheme(theme);
}