Merge pull request #6 from mexmer/gui-transparency-fixes

aaraujo666 · aaraujo666 · commit 672b104d98a3 · 2015-07-03T19:19:59.000-04:00
Gui transparency fixes
diff --git a/Sources/Sandbox.Game/Game/Screens/Helpers/MyGuiControlComponentList.cs b/Sources/Sandbox.Game/Game/Screens/Helpers/MyGuiControlComponentList.cs
@@ -121,6 +121,11 @@ internal ItemIconControl(MyPhysicalItemDefinition def)
                         originAlign: MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP));
                 }
             }
+
+            public override void Draw(float transitionAlpha, float backgroundTransitionAlpha)
+            {
+                base.Draw(transitionAlpha, transitionAlpha);
+            }
         }
 
         internal class ComponentControl : MyGuiControlBase
diff --git a/Sources/Sandbox.Game/Game/Screens/MyGuiScreenDialogAmount.cs b/Sources/Sandbox.Game/Game/Screens/MyGuiScreenDialogAmount.cs
@@ -41,7 +41,7 @@ public class MyGuiScreenDialogAmount : MyGuiScreenBase
         /// <param name="minMaxDecimalDigits">Number of digits used from min and max value. Decimal places beyond this value are cut off (no rounding occurs).</param>
         /// <param name="parseAsInteger">True will ensure parsing as integer number (you cannot input decimal values). False will parse as decimal number.</param>
         public MyGuiScreenDialogAmount(float min, float max, int minMaxDecimalDigits = 3, bool parseAsInteger = false, float? defaultAmount = null, MyStringId? caption = null) :
-            base(new Vector2(0.5f, 0.5f), MyGuiConstants.SCREEN_BACKGROUND_COLOR, null)
+            base(new Vector2(0.5f, 0.5f), MyGuiConstants.SCREEN_BACKGROUND_COLOR, null, backgroundTransition: MySandboxGame.Config.UIBkTransparency, guiTransition: MySandboxGame.Config.UITransparency)
         {
             CanHideOthers = false;
             EnabledBackgroundFade = true;
diff --git a/Sources/Sandbox.Game/Game/SessionComponents/MySessionComponentVoxelHand.cs b/Sources/Sandbox.Game/Game/SessionComponents/MySessionComponentVoxelHand.cs
@@ -416,7 +416,7 @@ public void DrawMaterial()
             var pos = new Vector2(0.5525f,0.84f);
             var size = new Vector2(0.05f, 0.05f);
 
-            m_texture.Draw(pos, size, Color.White);
+            m_texture.Draw(pos, size, Color.White, Color.White);
             MyGuiManager.DrawBorders(pos, size, Color.White, 1);
             
             pos.X += 0.06f;
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiCompositeTexture.cs b/Sources/Sandbox.Graphics/Gui/MyGuiCompositeTexture.cs
@@ -170,7 +170,7 @@ public void Draw(Vector2 positionTopLeft, float innerHeight, Color colorMask)
             }
         }
 
-        public void Draw(Vector2 positionLeftTop, Vector2 size, Color colorMask, float textureScale = 1f)
+        public void Draw(Vector2 positionLeftTop, Vector2 size, Color colorMask, Color colorMaskCenter, float textureScale = 1f)
         {
             Rectangle target;
             size = Vector2.Clamp(size, MinSizeGui * textureScale, MaxSizeGui * textureScale);
@@ -268,7 +268,7 @@ public void Draw(Vector2 positionLeftTop, Vector2 size, Color colorMask, float t
                 var screenSizeC = screenSize - new Vector2I(leftWidth + rightWidth, topHeight + bottomHeight);
                 var pos = screenPosLT + new Vector2I(leftWidth, topHeight);
                 SetTargetRectangle(out target, ref pos, ref screenSizeC, MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP);
-                MyGuiManager.DrawSprite(m_center.Texture, target, colorMask);
+                MyGuiManager.DrawSprite(m_center.Texture, target, colorMaskCenter);
             }
         }
 
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlBase.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlBase.cs
@@ -598,17 +598,17 @@ public static void ReadIfHasValue(ref Color target, Vector4? source)
 
         public virtual void Draw(float transitionAlpha, float backgroundTransitionAlpha)
         {
-            DrawBackground(backgroundTransitionAlpha);
+            DrawBackground(transitionAlpha, backgroundTransitionAlpha);
             DrawElements(transitionAlpha, backgroundTransitionAlpha);
             DrawBorder(transitionAlpha);
         }
 
-        protected void DrawBackground(float transitionAlpha)
+        protected void DrawBackground(float transitionAlpha, float backgroundTransitionAlpha)
         {
             // Draw background texture if there is one and background is not completely transparent.
             if (BackgroundTexture != null && ColorMask.W > 0.0f)
             {
-                BackgroundTexture.Draw(GetPositionAbsoluteTopLeft(), Size, ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha));
+                BackgroundTexture.Draw(GetPositionAbsoluteTopLeft(), Size, ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));
             }
         }
 
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlCombobox.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlCombobox.cs
@@ -966,7 +966,7 @@ private void DrawOpenedAreaItems(int startIndex, int endIndex, float transitionA
             Vector2 dropdownSize = Vector2.Clamp(new Vector2(Size.X, itemsHeight + minSize.Y), minSize, maxSize);
             var topLeft = GetPositionAbsoluteTopLeft();
             m_styleDef.DropDownTexture.Draw(topLeft + m_openedArea.Position, dropdownSize,
-                ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha));
+                ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha));
 
             // Scissor to cut off items that overflow dropdown area.
             var scissor         = m_openedItemArea;
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlCompositePanel.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlCompositePanel.cs
@@ -46,7 +46,7 @@ public override MyObjectBuilder_GuiControlBase GetObjectBuilder()
 
         public override void Draw(float transitionAlpha, float backgroundTransitionAlpha)
         {
-            BackgroundTexture.Draw(GetPositionAbsoluteTopLeft(), Size, ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));
+            BackgroundTexture.Draw(GetPositionAbsoluteTopLeft(), Size, ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));
             DrawBorder(transitionAlpha);
         }
 
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlGrid.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlGrid.cs
@@ -546,7 +546,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha
         {
             base.Draw(transitionAlpha, backgroundTransitionAlpha);
             RefreshItemsRectangle();
-            DrawItemBackgrounds(backgroundTransitionAlpha);
+            DrawItemBackgrounds(transitionAlpha, backgroundTransitionAlpha);
             DrawItems(transitionAlpha);
             DrawItemTexts(transitionAlpha);
             //DebugDraw();
@@ -700,7 +700,7 @@ private void DebugDraw()
             }
         }
 
-        private void DrawItemBackgrounds(float transitionAlpha)
+        private void DrawItemBackgrounds(float transitionAlpha, float backgroundTransitionAlpha)
         {
             var normalTexture = m_styleDef.ItemTexture.Normal;
             var highlightTexture = m_styleDef.ItemTexture.Highlight;
@@ -729,8 +729,10 @@ private void DrawItemBackgrounds(float transitionAlpha)
                         texture: highlight ? highlightTexture : normalTexture,
                         normalizedCoord: drawPositionTopLeft,
                         normalizedSize: ItemSize,
-                        color: ApplyColorMaskModifiers(ColorMask, enabled, transitionAlpha * blinkingTransparency),
+                        color: ApplyColorMaskModifiers(ColorMask, enabled, backgroundTransitionAlpha * blinkingTransparency),
                         drawAlign: MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP);
+                    if (highlight && backgroundTransitionAlpha < 0.2)
+                        MyGuiManager.DrawBorders(drawPositionTopLeft, ItemSize, ApplyColorMaskModifiers(MyGuiConstants.THEMED_GUI_LINE_COLOR.ToVector4(), Enabled, transitionAlpha),1);
                     ++idx;
                 }
             }
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlList.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlList.cs
@@ -134,6 +134,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha
         {
             var topLeft = GetPositionAbsoluteTopLeft();
             m_styleDef.Texture.Draw(topLeft, Size,
+                ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha),
                 ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));
 
             var scissor = m_itemsRectangle;
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlListbox.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlListbox.cs
@@ -409,7 +409,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha
             base.Draw(transitionAlpha, backgroundTransitionAlpha);
             var positionTopLeft = GetPositionAbsoluteTopLeft();
 
-            m_styleDef.Texture.Draw(positionTopLeft, Size, ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));
+            m_styleDef.Texture.Draw(positionTopLeft, Size, ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));
 
             var position = positionTopLeft + new Vector2(m_itemsRectangle.X, m_itemsRectangle.Y);
             int index = m_visibleRowIndexOffset;
@@ -449,6 +449,8 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha
                     if (isHighlit)
                     {
                         MyGuiManager.DrawSpriteBatch(m_styleDef.ItemTextureHighlight, position, ItemSize, color, MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP);
+                        if (backgroundTransitionAlpha < 0.2)
+                            MyGuiManager.DrawBorders(position, ItemSize, ApplyColorMaskModifiers(MyGuiConstants.THEMED_GUI_LINE_COLOR.ToVector4(), Enabled, transitionAlpha), 1);
                     }
 
                     if (!String.IsNullOrEmpty(item.Icon))
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlRadioButton.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlRadioButton.cs
@@ -305,7 +305,7 @@ public override MyGuiControlBase HandleInput()
 
         public override void Draw(float transitionAlpha, float backgroundTransitionAlpha)
         {
-            base.Draw(transitionAlpha, backgroundTransitionAlpha);
+            base.Draw(transitionAlpha, transitionAlpha);
 
             Vector2 topLeft = Vector2.Zero;
             if (Icon.HasValue || (Text != null && Text.Length > 0))
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlSlider.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlSlider.cs
@@ -260,6 +260,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha
                 GetPositionAbsoluteTopLeft(),
                 Size - new Vector2(m_labelSpaceWidth, 0f),
                 ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha),
+                ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha),
                 textureScale: DebugScale);
             DrawThumb(transitionAlpha);
             m_label.Draw(transitionAlpha, backgroundTransitionAlpha);
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlTabControl.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlTabControl.cs
@@ -195,7 +195,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha
                 var font              = (isEnabled && isHighlight) ? MyFontEnum.White : MyFontEnum.Blue;
 
                 // Draw background texture
-                texture.Draw(currentPos, TabButtonSize, ApplyColorMaskModifiers(ColorMask, isEnabled, transitionAlpha), m_tabButtonScale);
+                texture.Draw(currentPos, TabButtonSize, ApplyColorMaskModifiers(ColorMask, isEnabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, isEnabled, backgroundTransitionAlpha), m_tabButtonScale);
                 StringBuilder text = currentTab.Text;
                 if (text != null)
                 {
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlTable.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlTable.cs
@@ -449,7 +449,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha
             var position = GetPositionAbsoluteTopLeft();
             float height = RowHeight * (VisibleRowsCount + 1); // One row is taken up by the header of the table.
             m_styleDef.Texture.Draw(position, Size,
-                ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));
+                ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));
 
             if (HeaderVisible)
                 DrawHeader(transitionAlpha);
diff --git a/Sources/Sandbox.Graphics/Gui/MyGuiControlTextbox.cs b/Sources/Sandbox.Graphics/Gui/MyGuiControlTextbox.cs
@@ -265,7 +265,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha
             if (!Visible)
                 return;
 
-            m_compositeBackground.Draw(GetPositionAbsoluteTopLeft(), Size, ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));
+            m_compositeBackground.Draw(GetPositionAbsoluteTopLeft(), Size, ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));
 
             base.Draw(transitionAlpha, backgroundTransitionAlpha);
 
diff --git a/Sources/Sandbox.Graphics/Gui/MyScrollbar.cs b/Sources/Sandbox.Graphics/Gui/MyScrollbar.cs
@@ -173,14 +173,14 @@ public override void Draw(Color colorMask)
             }
 
             var leftTopPosition = OwnerControl.GetPositionAbsoluteCenter() + Position;
-            m_backgroundTexture.Draw(leftTopPosition, Size, colorMask);
+            m_backgroundTexture.Draw(leftTopPosition, Size, colorMask, colorMask);
 
             if (CanScroll())
             {
                 var carretPosition = GetCarretPosition();
                 Texture.Draw(leftTopPosition + carretPosition,
                     CaretSize,
-                    colorMask);
+                    colorMask, colorMask);
             }
         }
 
@@ -280,13 +280,14 @@ public override void Draw(Color colorMask)
             }
 
             var leftTopPosition = OwnerControl.GetPositionAbsoluteCenter() + Position;
-            m_backgroundTexture.Draw(leftTopPosition, Size, colorMask);
+            m_backgroundTexture.Draw(leftTopPosition, Size, colorMask, colorMask);
 
             if (CanScroll())
             {
                 var carretPosition = GetCarretPosition();
                 Texture.Draw(leftTopPosition + carretPosition,
                     CaretSize,
+                    colorMask, 
                     colorMask,
                     ScrollBarScale);
             }

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,11 @@ internal ItemIconControl(MyPhysicalItemDefinition def)`
`121`	`121`	`originAlign: MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP));`
`122`	`122`	`}`
`123`	`123`	`}`
	`124`	`+`
	`125`	`+ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha)`
	`126`	`+ {`
	`127`	`+ base.Draw(transitionAlpha, transitionAlpha);`
	`128`	`+ }`
`124`	`129`	`}`
`125`	`130`
`126`	`131`	`internal class ComponentControl : MyGuiControlBase`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class MyGuiScreenDialogAmount : MyGuiScreenBase`
`41`	`41`	`/// <param name="minMaxDecimalDigits">Number of digits used from min and max value. Decimal places beyond this value are cut off (no rounding occurs).</param>`
`42`	`42`	`/// <param name="parseAsInteger">True will ensure parsing as integer number (you cannot input decimal values). False will parse as decimal number.</param>`
`43`	`43`	`public MyGuiScreenDialogAmount(float min, float max, int minMaxDecimalDigits = 3, bool parseAsInteger = false, float? defaultAmount = null, MyStringId? caption = null) :`
`44`		`- base(new Vector2(0.5f, 0.5f), MyGuiConstants.SCREEN_BACKGROUND_COLOR, null)`
	`44`	`+ base(new Vector2(0.5f, 0.5f), MyGuiConstants.SCREEN_BACKGROUND_COLOR, null, backgroundTransition: MySandboxGame.Config.UIBkTransparency, guiTransition: MySandboxGame.Config.UITransparency)`
`45`	`45`	`{`
`46`	`46`	`CanHideOthers = false;`
`47`	`47`	`EnabledBackgroundFade = true;`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public void Draw(Vector2 positionTopLeft, float innerHeight, Color colorMask)`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
`173`		`- public void Draw(Vector2 positionLeftTop, Vector2 size, Color colorMask, float textureScale = 1f)`
	`173`	`+ public void Draw(Vector2 positionLeftTop, Vector2 size, Color colorMask, Color colorMaskCenter, float textureScale = 1f)`
`174`	`174`	`{`
`175`	`175`	`Rectangle target;`
`176`	`176`	`size = Vector2.Clamp(size, MinSizeGui * textureScale, MaxSizeGui * textureScale);`
`@@ -268,7 +268,7 @@ public void Draw(Vector2 positionLeftTop, Vector2 size, Color colorMask, float t`
`268`	`268`	`var screenSizeC = screenSize - new Vector2I(leftWidth + rightWidth, topHeight + bottomHeight);`
`269`	`269`	`var pos = screenPosLT + new Vector2I(leftWidth, topHeight);`
`270`	`270`	`SetTargetRectangle(out target, ref pos, ref screenSizeC, MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP);`
`271`		`- MyGuiManager.DrawSprite(m_center.Texture, target, colorMask);`
	`271`	`+ MyGuiManager.DrawSprite(m_center.Texture, target, colorMaskCenter);`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`
Original file line number	Diff line number	Diff line change
`@@ -598,17 +598,17 @@ public static void ReadIfHasValue(ref Color target, Vector4? source)`
`598`	`598`
`599`	`599`	`public virtual void Draw(float transitionAlpha, float backgroundTransitionAlpha)`
`600`	`600`	`{`
`601`		`- DrawBackground(backgroundTransitionAlpha);`
	`601`	`+ DrawBackground(transitionAlpha, backgroundTransitionAlpha);`
`602`	`602`	`DrawElements(transitionAlpha, backgroundTransitionAlpha);`
`603`	`603`	`DrawBorder(transitionAlpha);`
`604`	`604`	`}`
`605`	`605`
`606`		`- protected void DrawBackground(float transitionAlpha)`
	`606`	`+ protected void DrawBackground(float transitionAlpha, float backgroundTransitionAlpha)`
`607`	`607`	`{`
`608`	`608`	`// Draw background texture if there is one and background is not completely transparent.`
`609`	`609`	`if (BackgroundTexture != null && ColorMask.W > 0.0f)`
`610`	`610`	`{`
`611`		`- BackgroundTexture.Draw(GetPositionAbsoluteTopLeft(), Size, ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha));`
	`611`	`+ BackgroundTexture.Draw(GetPositionAbsoluteTopLeft(), Size, ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));`
`612`	`612`	`}`
`613`	`613`	`}`
`614`	`614`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public override MyObjectBuilder_GuiControlBase GetObjectBuilder()`
`46`	`46`
`47`	`47`	`public override void Draw(float transitionAlpha, float backgroundTransitionAlpha)`
`48`	`48`	`{`
`49`		`- BackgroundTexture.Draw(GetPositionAbsoluteTopLeft(), Size, ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));`
	`49`	`+ BackgroundTexture.Draw(GetPositionAbsoluteTopLeft(), Size, ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));`
`50`	`50`	`DrawBorder(transitionAlpha);`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha`
`546`	`546`	`{`
`547`	`547`	`base.Draw(transitionAlpha, backgroundTransitionAlpha);`
`548`	`548`	`RefreshItemsRectangle();`
`549`		`- DrawItemBackgrounds(backgroundTransitionAlpha);`
	`549`	`+ DrawItemBackgrounds(transitionAlpha, backgroundTransitionAlpha);`
`550`	`550`	`DrawItems(transitionAlpha);`
`551`	`551`	`DrawItemTexts(transitionAlpha);`
`552`	`552`	`//DebugDraw();`
`@@ -700,7 +700,7 @@ private void DebugDraw()`
`700`	`700`	`}`
`701`	`701`	`}`
`702`	`702`
`703`		`- private void DrawItemBackgrounds(float transitionAlpha)`
	`703`	`+ private void DrawItemBackgrounds(float transitionAlpha, float backgroundTransitionAlpha)`
`704`	`704`	`{`
`705`	`705`	`var normalTexture = m_styleDef.ItemTexture.Normal;`
`706`	`706`	`var highlightTexture = m_styleDef.ItemTexture.Highlight;`
`@@ -729,8 +729,10 @@ private void DrawItemBackgrounds(float transitionAlpha)`
`729`	`729`	`texture: highlight ? highlightTexture : normalTexture,`
`730`	`730`	`normalizedCoord: drawPositionTopLeft,`
`731`	`731`	`normalizedSize: ItemSize,`
`732`		`- color: ApplyColorMaskModifiers(ColorMask, enabled, transitionAlpha * blinkingTransparency),`
	`732`	`+ color: ApplyColorMaskModifiers(ColorMask, enabled, backgroundTransitionAlpha * blinkingTransparency),`
`733`	`733`	`drawAlign: MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP);`
	`734`	`+ if (highlight && backgroundTransitionAlpha < 0.2)`
	`735`	`+ MyGuiManager.DrawBorders(drawPositionTopLeft, ItemSize, ApplyColorMaskModifiers(MyGuiConstants.THEMED_GUI_LINE_COLOR.ToVector4(), Enabled, transitionAlpha),1);`
`734`	`736`	`++idx;`
`735`	`737`	`}`
`736`	`738`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha`
`134`	`134`	`{`
`135`	`135`	`var topLeft = GetPositionAbsoluteTopLeft();`
`136`	`136`	`m_styleDef.Texture.Draw(topLeft, Size,`
	`137`	`+ ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha),`
`137`	`138`	`ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));`
`138`	`139`
`139`	`140`	`var scissor = m_itemsRectangle;`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha`
`409`	`409`	`base.Draw(transitionAlpha, backgroundTransitionAlpha);`
`410`	`410`	`var positionTopLeft = GetPositionAbsoluteTopLeft();`
`411`	`411`
`412`		`- m_styleDef.Texture.Draw(positionTopLeft, Size, ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));`
	`412`	`+ m_styleDef.Texture.Draw(positionTopLeft, Size, ApplyColorMaskModifiers(ColorMask, Enabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, Enabled, backgroundTransitionAlpha));`
`413`	`413`
`414`	`414`	`var position = positionTopLeft + new Vector2(m_itemsRectangle.X, m_itemsRectangle.Y);`
`415`	`415`	`int index = m_visibleRowIndexOffset;`
`@@ -449,6 +449,8 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha`
`449`	`449`	`if (isHighlit)`
`450`	`450`	`{`
`451`	`451`	`MyGuiManager.DrawSpriteBatch(m_styleDef.ItemTextureHighlight, position, ItemSize, color, MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP);`
	`452`	`+ if (backgroundTransitionAlpha < 0.2)`
	`453`	`+ MyGuiManager.DrawBorders(position, ItemSize, ApplyColorMaskModifiers(MyGuiConstants.THEMED_GUI_LINE_COLOR.ToVector4(), Enabled, transitionAlpha), 1);`
`452`	`454`	`}`
`453`	`455`
`454`	`456`	`if (!String.IsNullOrEmpty(item.Icon))`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ public override MyGuiControlBase HandleInput()`
`305`	`305`
`306`	`306`	`public override void Draw(float transitionAlpha, float backgroundTransitionAlpha)`
`307`	`307`	`{`
`308`		`- base.Draw(transitionAlpha, backgroundTransitionAlpha);`
	`308`	`+ base.Draw(transitionAlpha, transitionAlpha);`
`309`	`309`
`310`	`310`	`Vector2 topLeft = Vector2.Zero;`
`311`	`311`	`if (Icon.HasValue \|\| (Text != null && Text.Length > 0))`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public override void Draw(float transitionAlpha, float backgroundTransitionAlpha`
`195`	`195`	`var font = (isEnabled && isHighlight) ? MyFontEnum.White : MyFontEnum.Blue;`
`196`	`196`
`197`	`197`	`// Draw background texture`
`198`		`- texture.Draw(currentPos, TabButtonSize, ApplyColorMaskModifiers(ColorMask, isEnabled, transitionAlpha), m_tabButtonScale);`
	`198`	`+ texture.Draw(currentPos, TabButtonSize, ApplyColorMaskModifiers(ColorMask, isEnabled, transitionAlpha), ApplyColorMaskModifiers(ColorMask, isEnabled, backgroundTransitionAlpha), m_tabButtonScale);`
`199`	`199`	`StringBuilder text = currentTab.Text;`
`200`	`200`	`if (text != null)`
`201`	`201`	`{`