From b908cc41c91c60c8e2c6395a2e14ec39fa9f3aab Mon Sep 17 00:00:00 2001 From: AdmAlexus Date: Fri, 27 Oct 2017 20:01:14 +0500 Subject: [PATCH] Revert "Fix V3002, V3114 warnings from PVS-Studio Static Analyzer" This reverts commit f4996ae1067a4cb6855f8d904e9f197c4d61b980. --- Histacom2.Engine/UI/ClassicStartMenuItem.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Histacom2.Engine/UI/ClassicStartMenuItem.cs b/Histacom2.Engine/UI/ClassicStartMenuItem.cs index 463cf8f..dcb8361 100644 --- a/Histacom2.Engine/UI/ClassicStartMenuItem.cs +++ b/Histacom2.Engine/UI/ClassicStartMenuItem.cs @@ -57,24 +57,21 @@ protected override void OnPaint(PaintEventArgs e) if (BackgroundImageLayout == ImageLayout.Stretch) e.Graphics.DrawImage(BackgroundImage, new Rectangle(0, 0, Width, Height + 9)); } - int imgWidth = 0; - if (Image != null) - { - if (Selected) + if (Selected) { if (SaveSystem.currentTheme != null && DoBackColorAdapt) e.Graphics.FillRectangle(new SolidBrush(SaveSystem.currentTheme.selectedBackColor), new Rectangle(0, 0, Width, Image.Height)); else e.Graphics.FillRectangle(Brushes.Navy, new Rectangle(0, 0, Width, Image.Height)); } e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; - e.Graphics.DrawImage(Image, 0 + Padding.Left - Padding.Right, 0); imgWidth = Image.Width; - - } - //if (Image != null) if (Height != Image.Height) if (layout == ClassicStartMenuItemLayout.CloseTitleWithLightSubtitle && Height != Image.Height + 8) { Height = Image.Height; } StringFormat sf = new StringFormat(); sf.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show; + int imgWidth = 0; + if (Image != null) { e.Graphics.DrawImage(Image, 0 + Padding.Left - Padding.Right, 0); imgWidth = Image.Width; } + //if (Image != null) if (Height != Image.Height) if (layout == ClassicStartMenuItemLayout.CloseTitleWithLightSubtitle && Height != Image.Height + 8) { Height = Image.Height; } + if (!Selected) { switch (layout) { case ClassicStartMenuItemLayout.DistancedTitle: @@ -136,7 +133,7 @@ public enum ClassicStartMenuItemLayout { DistancedTitle, CloseTitle, - //CloseTitleWithTwoLines, + CloseTitleWithTwoLines, CloseTitleWithLightSubtitle } }