From 2968c39415d6f4ea4db275d1fc12861843616ae9 Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 20 Sep 2017 11:02:43 -0400 Subject: more 12padams stuff --- Histacom2.Engine/Paintbrush.cs | 2 ++ Histacom2.Engine/UI/ClassicButton.cs | 23 +++++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-) (limited to 'Histacom2.Engine') diff --git a/Histacom2.Engine/Paintbrush.cs b/Histacom2.Engine/Paintbrush.cs index 02cb49b..ff715d2 100644 --- a/Histacom2.Engine/Paintbrush.cs +++ b/Histacom2.Engine/Paintbrush.cs @@ -49,6 +49,7 @@ namespace Histacom2.Engine public static Color GetLightFromColor(Color basecolor) { if (basecolor == Color.Silver) return Color.White; + if (basecolor == Color.Green) return Color.FromArgb(64, 255, 64); if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(184, 184, 184); if (basecolor == Color.FromArgb(169, 200, 169)) return Color.FromArgb(218, 223, 218); return ControlPaint.Light(basecolor, 70); @@ -57,6 +58,7 @@ namespace Histacom2.Engine public static Color GetDarkFromColor(Color basecolor) { if (basecolor == Color.Silver) return Color.Gray; + if (basecolor == Color.Green) return Color.FromArgb(0, 83, 0); if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(72, 72, 72); if (basecolor == Color.FromArgb(169, 200, 169)) return Color.FromArgb(95, 153, 95); return ControlPaint.Dark(basecolor, 70); diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index 027d198..29b3a3b 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -15,26 +15,17 @@ namespace Histacom2.Engine.UI private bool _pressing = false; - public DialogResult DialogResult - { - get - { - throw new NotImplementedException(); - } - - set - { - throw new NotImplementedException(); - } - } + public DialogResult DialogResult { get; set; } - public bool AdaptBackColorWithTheme = true; - public bool AdaptForeColorWithTheme = true; - public bool AdaptFontWithTheme = true; + public bool AdaptBackColorWithTheme { get; set; } + public bool AdaptForeColorWithTheme { get; set; } + public bool AdaptFontWithTheme { get; set; } public ClassicButton() : base() { - + AdaptBackColorWithTheme = true; + AdaptForeColorWithTheme = true; + AdaptFontWithTheme = true; if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; else BackColor = Color.Silver; _lightBack = ControlPaint.Light(BackColor, 50); -- cgit v1.2.3