Commit 81c67438 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Added convertsion from wxColour to COLOR4D.

parent 08c54e8a

common/gal/color4d.cpp

+11 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,17 @@ COLOR4D::COLOR4D( EDA_COLOR_T aColor ) 
}

}









#ifdef WX_COMPATIBILITY

    COLOR4D::COLOR4D( const wxColour& aColor )

    {

        r = aColor.Red();

        g = aColor.Green();

        b = aColor.Blue();

        a = aColor.Alpha();

    }

#endif





const bool COLOR4D::operator==( const COLOR4D& aColor )

const bool COLOR4D::operator==( const COLOR4D& aColor )

{

{

    return a == aColor.a && r == aColor.r && g == aColor.g && b == aColor.b;

    return a == aColor.a && r == aColor.r && g == aColor.g && b == aColor.b;

include/gal/color4d.h

+9 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,15 @@ public: 
     */

     */

    COLOR4D( EDA_COLOR_T aColor );

    COLOR4D( EDA_COLOR_T aColor );





#ifdef WX_COMPATIBILITY

    /**

     * @brief Constructor

     *

     * @param aColor is the color type used by wxWidgets.

     */

    COLOR4D( const wxColour& aColor );

#endif /* WX_COMPATIBLITY */



    /**

    /**

     * Function Highlight

     * Function Highlight

     * Makes the color brighter by a given factor.

     * Makes the color brighter by a given factor.