shiftos-archive/Histacom2
1
0
Fork 0
mirror of https://github.com/HistacomUnity/Histacom2-old.git synced 2025-01-22 09:02:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix V3002, V3114 warnings from PVS-Studio Static Analyzer"

Browse source 
This reverts commit f4996ae106.
This commit is contained in:
AdmAlexus 2017-10-27 20:01:14 +05:00
parent f4996ae106
commit b908cc41c9
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Histacom2.Engine/UI/ClassicStartMenuItem.cs
View file

@ -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)); if (BackgroundImageLayout == ImageLayout.Stretch) e.Graphics.DrawImage(BackgroundImage, new Rectangle(0, 0, Width, Height + 9));
} }
int imgWidth = 0; if (Selected)
if (Image != null)
{
if (Selected)
{ {
if (SaveSystem.currentTheme != null && DoBackColorAdapt) e.Graphics.FillRectangle(new SolidBrush(SaveSystem.currentTheme.selectedBackColor), new Rectangle(0, 0, Width, Image.Height)); 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)); else e.Graphics.FillRectangle(Brushes.Navy, new Rectangle(0, 0, Width, Image.Height));
} }
e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; 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(); StringFormat sf = new StringFormat();
sf.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show; 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) { if (!Selected) {
switch (layout) { switch (layout) {
case ClassicStartMenuItemLayout.DistancedTitle: case ClassicStartMenuItemLayout.DistancedTitle:
@ -136,7 +133,7 @@ public enum ClassicStartMenuItemLayout
{ {
DistancedTitle, DistancedTitle,
CloseTitle, CloseTitle,
//CloseTitleWithTwoLines, CloseTitleWithTwoLines,
CloseTitleWithLightSubtitle CloseTitleWithLightSubtitle
} }
} }