CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 19:20:27 +12:00
Code Issues Packages Projects Releases Wiki Activity

Removed ExperimentalCustomTheme option

Browse source
This commit is contained in:
Jaex 2020-05-22 08:44:02 +03:00
parent 294eb62c95
commit d6600df108
9 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HelpersLib/Forms/ClipboardContentViewer.cs
View file

@ -42,7 +42,7 @@ public ClipboardContentViewer(bool showCheckBox = false)
InitializeComponent();
ShareXResources.ApplyTheme(this);
if (ShareXResources.ExperimentalCustomTheme)
if (ShareXResources.UseCustomTheme)
{
lblQuestion.BackColor = ShareXResources.Theme.BorderColor;
}

2
ShareX.HelpersLib/Forms/MyMessageBox.cs
View file

@ -148,7 +148,7 @@ public MyMessageBox(string text, string caption, MessageBoxButtons buttons = Mes
ShareXResources.ApplyTheme(this);
if (ShareXResources.ExperimentalCustomTheme)
if (ShareXResources.UseCustomTheme)
{
panel.BackColor = ShareXResources.Theme.BorderColor;
}

2
ShareX.HelpersLib/NameParser/CodeMenu.cs
View file

@ -103,7 +103,7 @@ public CodeMenu(TextBoxBase tbb, CodeMenuItem[] items)
tsmiClose.Click += (sender, e) => Close();
Items.Add(tsmiClose);
if (ShareXResources.ExperimentalCustomTheme)
if (ShareXResources.UseCustomTheme)
{
ShareXResources.ApplyCustomThemeToContextMenuStrip(this);
}

16
ShareX.HelpersLib/ShareXResources.cs
View file

@ -55,20 +55,6 @@ public static bool UseCustomTheme
}
}
private static bool experimentalCustomTheme;
public static bool ExperimentalCustomTheme
{
get
{
return UseCustomTheme && experimentalCustomTheme;
}
set
{
experimentalCustomTheme = value;
}
}
public static bool IsDarkTheme => UseCustomTheme && Theme.IsDarkTheme;
public static bool UseWhiteIcon { get; set; }
@ -86,7 +72,7 @@ public static void ApplyTheme(Form form, bool setIcon = true)
form.Icon = Icon;
}
if (ExperimentalCustomTheme)
if (UseCustomTheme)
{
ApplyCustomThemeToControl(form);

2
ShareX.HistoryLib/Forms/ImageHistoryForm.cs
View file

@ -56,7 +56,7 @@ public ImageHistoryForm(string historyPath, ImageHistorySettings settings, Actio
ilvImages.View = (View)Settings.ViewMode;
ilvImages.ThumbnailSize = Settings.ThumbnailSize;
if (ShareXResources.ExperimentalCustomTheme)
if (ShareXResources.UseCustomTheme)
{
ilvImages.BorderStyle = BorderStyle.None;
ilvImages.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor;

2
ShareX.ScreenCaptureLib/Forms/StickerImageListViewRenderer.cs
View file

@ -43,7 +43,7 @@ public override void InitializeGraphics(Graphics g)
ImageListView.Colors.SelectedColor1 = ImageListView.Colors.HoverColor1 = ImageListView.Colors.UnFocusedColor1 = Color.FromArgb(252, 221, 132);
ImageListView.Colors.SelectedColor2 = ImageListView.Colors.HoverColor2 = ImageListView.Colors.UnFocusedColor2 = Color.Transparent;
if (ShareXResources.ExperimentalCustomTheme)
if (ShareXResources.UseCustomTheme)
{
ImageListView.BackColor = ShareXResources.Theme.BackgroundColor;
ImageListView.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor;

2
ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs
View file

@ -327,7 +327,7 @@ private void UpdateInputBox()
private void UpdateButtonImages()
{
if (ShareXResources.ExperimentalCustomTheme)
if (ShareXResources.UseCustomTheme)
{
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsGradient);
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsAlignmentHorizontal);

1
ShareX/ApplicationConfig.cs
View file

@ -92,7 +92,6 @@ public ApplicationConfig()
public bool UseDarkTheme = true;
public bool UseCustomTheme = true;
public bool ExperimentalCustomTheme = true;
public List<ShareXTheme> Themes = ShareXTheme.GetPresets();
public int SelectedTheme = 0;

1
ShareX/Forms/MainForm.cs
View file

@ -796,7 +796,6 @@ public void UpdateTheme()
ShareXResources.Theme = Program.Settings.Themes[Program.Settings.SelectedTheme];
ShareXResources.UseCustomTheme = Program.Settings.UseCustomTheme;
ShareXResources.ExperimentalCustomTheme = Program.Settings.ExperimentalCustomTheme;
if (IsHandleCreated)
{