Prechádzať zdrojové kódy

Merge pull request #983 from Areloch/GuiPanelDeGradient

Removes the unnecessary gradient effect from GuiPanel when rendered.
Brian Roberts 2 rokov pred
rodič
commit
f1d42d3867

+ 3 - 6
Engine/source/gui/containers/guiPanel.cpp

@@ -33,9 +33,7 @@
 //-----------------------------------------------------------------------------
 
 ConsoleDocClass( GuiPanel,
-	"@brief The GuiPanel panel is a container that when opaque will "
-	"draw a left to right gradient using its profile fill and "
-	"fill highlight colors.\n\n"
+	"@brief The GuiPanel panel is a container that when rendered will fill with the gui profile's fill color.\n\n"
 
 	"@tsexample\n"
 	"// Mandatory GuiDefaultProfile\n"
@@ -44,7 +42,6 @@ ConsoleDocClass( GuiPanel,
 	"new GuiControlProfile (GuiDefaultProfile)\n"
 	"{\n"
 	"	// fill color\n"
-	"	opaque = false;\n"
 	"	fillColor = \"242 241 240\";\n"
 	"	fillColorHL =\"228 228 235\";\n"
 	"	fillColorSEL = \"98 100 137\";\n"
@@ -99,7 +96,7 @@ void GuiPanel::onRender(Point2I offset, const RectI &updateRect)
       // Draw a gradient left to right.
 
       PrimBuild::begin( GFXTriangleStrip, 4 );
-         PrimBuild::color( mProfile->mFillColorHL );
+         PrimBuild::color( mProfile->mFillColor);
          PrimBuild::vertex2i( ctrlRect.point.x, ctrlRect.point.y );
          PrimBuild::vertex2i( ctrlRect.point.x, ctrlRect.point.y + ctrlRect.extent.y );
 
@@ -110,4 +107,4 @@ void GuiPanel::onRender(Point2I offset, const RectI &updateRect)
    }
 
    Parent::onRender( offset, updateRect );
-}
+}

+ 2 - 4
Engine/source/gui/containers/guiPanel.h

@@ -33,9 +33,7 @@
 #endif
 
 
-/// The GuiPanel panel is a container that when opaque will
-/// draw a left to right gradient using its profile fill and
-/// fill highlight colors.
+/// The GuiPanel panel is a container that when rendered will render with the profile's fill colors
 ///
 /// @addtogroup gui_container_group Containers
 ///
@@ -59,4 +57,4 @@ public:
 };
 /// @}
 
-#endif // _GUI_PANEL_H_
+#endif // _GUI_PANEL_H_