mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Removed ExperimentalCustomTheme option
This commit is contained in:
parent
294eb62c95
commit
d6600df108
9 changed files with 7 additions and 23 deletions
|
@ -42,7 +42,7 @@ public ClipboardContentViewer(bool showCheckBox = false)
|
|||
InitializeComponent();
|
||||
ShareXResources.ApplyTheme(this);
|
||||
|
||||
if (ShareXResources.ExperimentalCustomTheme)
|
||||
if (ShareXResources.UseCustomTheme)
|
||||
{
|
||||
lblQuestion.BackColor = ShareXResources.Theme.BorderColor;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -327,7 +327,7 @@ private void UpdateInputBox()
|
|||
|
||||
private void UpdateButtonImages()
|
||||
{
|
||||
if (ShareXResources.ExperimentalCustomTheme)
|
||||
if (ShareXResources.UseCustomTheme)
|
||||
{
|
||||
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsGradient);
|
||||
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsAlignmentHorizontal);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue