diff options
| author | lempamo <[email protected]> | 2017-09-13 15:23:58 -0400 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-09-13 15:23:58 -0400 |
| commit | ca482366718339b0684f64980dc67587222b4850 (patch) | |
| tree | 23cbe04f662e649d3fe28bf7c120d826ae51788f /Histacom2.Engine | |
| parent | 868078d5cb4edafda5a01f116391d927ceeedf9d (diff) | |
| download | histacom2-ca482366718339b0684f64980dc67587222b4850.tar.gz histacom2-ca482366718339b0684f64980dc67587222b4850.tar.bz2 histacom2-ca482366718339b0684f64980dc67587222b4850.zip | |
fixed the calc buttons font and a namespace issue
Diffstat (limited to 'Histacom2.Engine')
| -rw-r--r-- | Histacom2.Engine/Histacom2.Engine.csproj | 2 | ||||
| -rw-r--r-- | Histacom2.Engine/UI/ClassicButton.cs | 12 | ||||
| -rw-r--r-- | Histacom2.Engine/UI/IProgressBar.cs | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index 050ad0c..889c071 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -15,7 +15,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> - <Optimize>true</Optimize> + <Optimize>false</Optimize> <OutputPath>bin\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index 26dbd26..9b1db72 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -28,25 +28,17 @@ namespace Histacom2.Engine.UI } } - public bool AdaptForeColorWithTheme { get; set; } - public bool AdaptFontWithTheme { get; set; } + public bool AdaptForeColorWithTheme = true; + public bool AdaptFontWithTheme = true; public ClassicButton() : base() { - AdaptForeColorWithTheme = true; - AdaptFontWithTheme = true; if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; else BackColor = Color.Silver; _lightBack = ControlPaint.Light(BackColor, 50); _darkBack = ControlPaint.Dark(BackColor, 50); - if (SaveSystem.currentTheme != null) ForeColor = SaveSystem.currentTheme.threeDObjectsTextColor; - else ForeColor = Color.Black; - - if (SaveSystem.currentTheme != null) Font = SaveSystem.currentTheme.buttonFont; - else Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); - MouseDown += (s, e) => { _pressing = true; Invalidate(); }; MouseUp += (s, e) => { _pressing = false; Invalidate(); }; Invalidate(); diff --git a/Histacom2.Engine/UI/IProgressBar.cs b/Histacom2.Engine/UI/IProgressBar.cs index 071da18..2cd916d 100644 --- a/Histacom2.Engine/UI/IProgressBar.cs +++ b/Histacom2.Engine/UI/IProgressBar.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace Histacom2.UI +namespace Histacom2.Engine.UI { public class ProgressBar : Control { |