mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed expr_color to color

Browse Source
This commit is contained in:
cnjinhao
2014-12-24 02:07:39 +08:00
parent 34c8392f35
commit ad7c36be3f
49 changed files with 296 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/paint/gadget.cpp
View File

@@ -209,7 +209,7 @@ namespace gadget
//arrow_16_pixels
//param@style: 0 = hollow, 1 = solid
void arrow_16_pixels(nana::paint::graphics& graph, int x, int y, const nana::expr_color& clr, uint32_t style, directions::t dir)
void arrow_16_pixels(nana::paint::graphics& graph, int x, int y, const nana::color& clr, uint32_t style, directions::t dir)
{
graph.set_color(clr);
switch(style)
@@ -230,7 +230,7 @@ namespace gadget
}
}
void close_16_pixels(::nana::paint::graphics& graph, int x, int y, uint32_t style, const ::nana::expr_color& clr)
void close_16_pixels(::nana::paint::graphics& graph, int x, int y, uint32_t style, const ::nana::color& clr)
{
graph.set_color(clr);
if(0 == style)
@@ -261,7 +261,7 @@ namespace gadget
}
}
void cross(graphics& graph, int x, int y, uint32_t size, uint32_t thickness, const ::nana::expr_color& color)
void cross(graphics& graph, int x, int y, uint32_t size, uint32_t thickness, const ::nana::color& color)
{
if (thickness + 2 <= size)
{
@@ -302,7 +302,7 @@ namespace gadget
ps[11].x = x + gap;
ps[11].y = y + gap;
::nana::expr_color darker(0, 0, 0);
::nana::color darker(0, 0, 0);
darker.blend(color, true);
graph.set_color(darker);