mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-29 17:02:05 +13:00
ExperimentalDarkTheme also gonna check for UseDarkTheme
This commit is contained in:
parent
a9fbc0f8b6
commit
b1fc6e0070
5 changed files with 20 additions and 6 deletions
|
@ -43,7 +43,7 @@ public ClipboardContentViewer(bool showCheckBox = false)
|
|||
InitializeComponent();
|
||||
ShareXResources.ApplyTheme(this);
|
||||
|
||||
if (ShareXResources.UseDarkTheme)
|
||||
if (ShareXResources.ExperimentalDarkTheme)
|
||||
{
|
||||
lblQuestion.BackColor = ShareXResources.DarkBorderColor;
|
||||
}
|
||||
|
|
|
@ -149,7 +149,7 @@ public MyMessageBox(string text, string caption, MessageBoxButtons buttons = Mes
|
|||
|
||||
ShareXResources.ApplyTheme(this);
|
||||
|
||||
if (ShareXResources.UseDarkTheme)
|
||||
if (ShareXResources.ExperimentalDarkTheme)
|
||||
{
|
||||
panel.BackColor = ShareXResources.DarkBorderColor;
|
||||
}
|
||||
|
|
|
@ -65,7 +65,7 @@ public static ContextMenuStrip Create(TextBoxBase tb, CodeMenuItem[] items)
|
|||
ShowImageMargin = false
|
||||
};
|
||||
|
||||
if (ShareXResources.UseDarkTheme)
|
||||
if (ShareXResources.ExperimentalDarkTheme)
|
||||
{
|
||||
cms.Renderer = new ToolStripDarkRenderer();
|
||||
}
|
||||
|
|
|
@ -42,8 +42,22 @@ public static string UserAgent
|
|||
}
|
||||
|
||||
public static bool UseDarkTheme { get; set; }
|
||||
|
||||
public static bool ExperimentalDarkTheme
|
||||
{
|
||||
get
|
||||
{
|
||||
return UseDarkTheme && experimentalDarkTheme;
|
||||
}
|
||||
set
|
||||
{
|
||||
experimentalDarkTheme = value;
|
||||
}
|
||||
}
|
||||
|
||||
private static bool experimentalDarkTheme;
|
||||
|
||||
public static bool UseWhiteIcon { get; set; }
|
||||
public static bool ExperimentalDarkTheme { get; set; } = true;
|
||||
|
||||
public static Icon Icon => UseWhiteIcon ? Resources.ShareX_Icon_White : Resources.ShareX_Icon;
|
||||
public static Image Logo => Resources.ShareX_Logo;
|
||||
|
@ -71,7 +85,7 @@ public static void ApplyTheme(Form form, bool setIcon = true)
|
|||
form.Icon = Icon;
|
||||
}
|
||||
|
||||
if (UseDarkTheme && ExperimentalDarkTheme)
|
||||
if (ExperimentalDarkTheme)
|
||||
{
|
||||
ApplyDarkThemeToControl(form);
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ public void ShowMenu()
|
|||
AutoClose = false
|
||||
};
|
||||
|
||||
if (ShareXResources.UseDarkTheme)
|
||||
if (ShareXResources.ExperimentalDarkTheme)
|
||||
{
|
||||
cms.Renderer = new ToolStripDarkRenderer();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue