From 5dd5d110d74741417b2901b6c2a7e7909f598f88 Mon Sep 17 00:00:00 2001 From: Jinhao Date: Sun, 26 Jul 2015 11:00:23 +0800 Subject: [PATCH] fix a compiling error due to VC2015 issue --- source/gui/element.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/gui/element.cpp b/source/gui/element.cpp index 71d70f8b..88d247c9 100644 --- a/source/gui/element.cpp +++ b/source/gui/element.cpp @@ -141,7 +141,7 @@ namespace nana } else { - ::nana::color highlighted(0x5e, 0xb6, 0xf7); + ::nana::color highlighted(static_cast(0x5eb6f7)); auto bld_bgcolor = bgcolor; auto bld_fgcolor = fgcolor; switch(es) @@ -156,7 +156,7 @@ namespace nana bld_fgcolor = fgcolor.blend(highlighted, 0.4); break; case element_state::disabled: - bld_bgcolor = bld_fgcolor = nana::color(0xb2, 0xb7, 0xbc); + bld_bgcolor = bld_fgcolor.from_rgb(0xb2, 0xb7, 0xbc); break; default: //Leave things as they are @@ -264,7 +264,7 @@ namespace nana bool draw(graph_reference graph, const ::nana::color& bgcolor, const ::nana::color& fgcolor, const ::nana::rectangle& r, element_state estate, unsigned weight) { graph.rectangle(r, false, static_cast((element_state::focus_hovered == estate || element_state::focus_normal == estate) ? 0x0595E2 : 0x999A9E)); - graph.rectangle(::nana::rectangle{r}.pare_off(1), false, bgcolor); + graph.rectangle(::nana::rectangle(r).pare_off(1), false, bgcolor); return true; } };