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

32
include/nana/basic_types.hpp
View File

@@ -152,26 +152,26 @@ namespace nana
enum class color_argb: unsigned{};
enum class color_rgba : unsigned{};
class expr_color
class color
{
public:
expr_color() = default;
expr_color(colors);
expr_color(colors, double alpha);
expr_color(color_rgb);
expr_color(color_argb);
expr_color(color_rgba);
expr_color(unsigned red, unsigned green, unsigned blue);
expr_color(unsigned red, unsigned green, unsigned blue, double alpha);
color() = default;
color(colors);
color(colors, double alpha);
color(color_rgb);
color(color_argb);
color(color_rgba);
color(unsigned red, unsigned green, unsigned blue);
color(unsigned red, unsigned green, unsigned blue, double alpha);
expr_color& alpha(double); ///< Sets alpha channel
expr_color& from_rgb(unsigned red, unsigned green, unsigned blue); ///< immutable alpha channel
expr_color& from_hsl(double hue, double saturation, double lightness); ///< immutable alpha channel
color& alpha(double); ///< Sets alpha channel
color& from_rgb(unsigned red, unsigned green, unsigned blue); ///< immutable alpha channel
color& from_hsl(double hue, double saturation, double lightness); ///< immutable alpha channel
expr_color& blend(const expr_color& bgcolor, bool ignore_bgcolor_alpha);
color& blend(const color& bgcolor, bool ignore_bgcolor_alpha);
///< Blends two colors with the specified alpha, and the alpha values that come with these two colors are both ignored.
expr_color& blend(const expr_color& bgcolor, double alpha);
color& blend(const color& bgcolor, double alpha);
bool invisible() const;
pixel_color_t px_color() const;
@@ -183,8 +183,8 @@ namespace nana
const double& b() const;
const double& a() const;
bool operator==(const expr_color& other) const;
bool operator!=(const expr_color& other) const;
bool operator==(const color& other) const;
bool operator!=(const color& other) const;
private:
double r_;
double g_;

6
include/nana/detail/linux_X11/platform_spec.hpp
View File

@@ -105,9 +105,9 @@ namespace detail
drawable_impl_type();
~drawable_impl_type();
void fgcolor(const ::nana::expr_color&); //deprecated
void set_color(const ::nana::expr_color&);
void set_text_color(const ::nana::expr_color&);
void fgcolor(const ::nana::color&); //deprecated
void set_color(const ::nana::color&);
void set_text_color(const ::nana::color&);
void update_color();
void update_text_color();

6
include/nana/detail/win32/platform_spec.hpp
View File

@@ -137,10 +137,10 @@ namespace detail
drawable_impl_type();
~drawable_impl_type();
void fgcolor(const ::nana::expr_color&); //deprecated
void fgcolor(const ::nana::color&); //deprecated
unsigned get_color() const;
void set_color(const ::nana::expr_color&);
void set_text_color(const ::nana::expr_color&);
void set_color(const ::nana::color&);
void set_text_color(const ::nana::color&);
void update_pen();
void update_brush();

6
include/nana/gui/detail/basic_window.hpp
View File

@@ -177,9 +177,9 @@ namespace detail
struct
{
expr_color fgcolor;
expr_color bgcolor;
expr_color activated;
color fgcolor;
color bgcolor;
color activated;
}colors;
struct

10
include/nana/gui/element.hpp
View File

@@ -35,7 +35,7 @@ namespace nana
virtual ~element_interface()
{}
virtual bool draw(graph_reference, const nana::expr_color& bgcolor, const nana::expr_color& fgcolor, const nana::rectangle&, element_state) = 0;
virtual bool draw(graph_reference, const nana::color& bgcolor, const nana::color& fgcolor, const nana::rectangle&, element_state) = 0;
};
class crook_interface
@@ -53,7 +53,7 @@ namespace nana
virtual ~crook_interface()
{}
virtual bool draw(graph_reference, const nana::expr_color& bgcolor, const nana::expr_color& fgcolor, const nana::rectangle&, element_state, const data&) = 0;
virtual bool draw(graph_reference, const nana::color& bgcolor, const nana::color& fgcolor, const nana::rectangle&, element_state, const data&) = 0;
};
class provider
@@ -122,7 +122,7 @@ namespace nana
void switch_to(const char*);
public:
//Implement element_interface
bool draw(graph_reference, const nana::expr_color& bgcolor, const nana::expr_color& fgcolor, const nana::rectangle& r, element_state) override;
bool draw(graph_reference, const nana::color& bgcolor, const nana::color& fgcolor, const nana::rectangle& r, element_state) override;
private:
element::crook_interface::data data_;
element::crook_interface* const * keeper_;
@@ -144,7 +144,7 @@ namespace nana
void set(const cloneable_element&);
void set(const char*);
bool draw(graph_reference, const nana::expr_color& bgcolor, const nana::expr_color& fgcolor, const nana::rectangle&, element_state);
bool draw(graph_reference, const nana::color& bgcolor, const nana::color& fgcolor, const nana::rectangle&, element_state);
private:
cloneable_element holder_;
element_interface * place_ptr_;
@@ -174,7 +174,7 @@ namespace nana
void stretch_parts(unsigned left, unsigned top, unsigned right, unsigned bottom);
//Implement the methods of element_interface.
virtual bool draw(graph_reference, const nana::expr_color& bgcolor, const nana::expr_color& fgcolor, const nana::rectangle&, element_state);
virtual bool draw(graph_reference, const nana::color& bgcolor, const nana::color& fgcolor, const nana::rectangle&, element_state);
private:
struct draw_method;
struct draw_image;

12
include/nana/gui/programming_interface.hpp
View File

@@ -202,12 +202,12 @@ namespace API
void modal_window(window); ///< Blocks the routine til the specified window is closed.
void wait_for(window);
expr_color fgcolor(window);
expr_color fgcolor(window, const expr_color&);
expr_color bgcolor(window);
expr_color bgcolor(window, const expr_color&);
expr_color activated_color(window);
expr_color activated_color(window, const expr_color&);
color fgcolor(window);
color fgcolor(window, const color&);
color bgcolor(window);
color bgcolor(window, const color&);
color activated_color(window);
color activated_color(window, const color&);
void create_caret(window, unsigned width, unsigned height);
void destroy_caret(window);

4
include/nana/gui/widgets/button.hpp
View File

@@ -68,8 +68,8 @@ namespace nana{
bool enable_pushed;
bool focus_color;
paint::image * icon;
::nana::expr_color bgcolor;
::nana::expr_color fgcolor;
::nana::color bgcolor;
::nana::color fgcolor;
}attr_;
};
}//end namespace button

8
include/nana/gui/widgets/date_chooser.hpp
View File

@@ -90,10 +90,10 @@ namespace nana
struct color_tag
{
::nana::expr_color highlight;
::nana::expr_color selected;
::nana::expr_color normal;
::nana::expr_color bgcolor;
::nana::color highlight;
::nana::color selected;
::nana::color normal;
::nana::color bgcolor;
}color_;
};

19
include/nana/gui/widgets/listbox.hpp
View File

@@ -33,14 +33,11 @@ namespace nana
{
struct format
{
//::nana::color_t bgcolor;
//::nana::color_t fgcolor;
::nana::expr_color bgcolor;
::nana::expr_color fgcolor;
::nana::color bgcolor;
::nana::color fgcolor;
format() = default;
format(const ::nana::expr_color& bgcolor, const ::nana::expr_color& fgcolor);
format(const ::nana::color& bgcolor, const ::nana::color& fgcolor);
};
using format_ptr = std::unique_ptr < format > ;
@@ -53,7 +50,7 @@ namespace nana
cell(cell&&);
cell(nana::string);
cell(nana::string, const format&);
cell(nana::string, const ::nana::expr_color& bgcolor, const ::nana::expr_color& fgcolor);
cell(nana::string, const ::nana::color& bgcolor, const ::nana::color& fgcolor);
cell& operator=(const cell&);
cell& operator=(cell&&);
@@ -216,11 +213,11 @@ namespace nana
item_proxy & select(bool);
bool selected() const;
item_proxy & bgcolor(const nana::expr_color&);
nana::expr_color bgcolor() const;
item_proxy & bgcolor(const nana::color&);
nana::color bgcolor() const;
item_proxy& fgcolor(const nana::expr_color&);
nana::expr_color fgcolor() const;
item_proxy& fgcolor(const nana::color&);
nana::color fgcolor() const;
index_pair pos() const;

8
include/nana/gui/widgets/picture.hpp
View File

@@ -26,7 +26,7 @@ namespace nana
void attached(widget_reference, graph_reference) override;
void load(const nana::char_t* file);
void load(const nana::paint::image&);
void set_shadow_background(const ::nana::expr_color& from, const ::nana::expr_color& to, bool horizontal);
void set_shadow_background(const ::nana::color& from, const ::nana::color& to, bool horizontal);
bool bgstyle(bool is_stretch, nana::arrange, int beg, int end);
private:
void refresh(graph_reference) override;
@@ -37,8 +37,8 @@ namespace nana
struct
{
::nana::expr_color gradual_from;
::nana::expr_color gradual_to;
::nana::color gradual_from;
::nana::color gradual_to;
bool horizontal;
}bground_;
@@ -72,7 +72,7 @@ namespace nana
);
/// Fills a gradual-change color in background. If One of colors is invisible or clr_from is equal to clr_to, it draws background in bgcolor.
void set_gradual_background(const ::nana::expr_color& clr_from, const ::nana::expr_color& clr_to, bool horizontal);
void set_gradual_background(const ::nana::color& clr_from, const ::nana::color& clr_to, bool horizontal);
void transparent(bool);
bool transparent() const;
};

10
include/nana/gui/widgets/skeletons/text_editor.hpp
View File

@@ -136,7 +136,7 @@ namespace nana{ namespace widgets
struct ext_renderer_tag
{
std::function<void(graph_reference, const nana::rectangle& text_area, const ::nana::expr_color&)> background;
std::function<void(graph_reference, const nana::rectangle& text_area, const ::nana::color&)> background;
};
text_editor(window, graph_reference);
@@ -151,7 +151,7 @@ namespace nana{ namespace widgets
/// Set the text_editor whether it is line wrapped, it returns false if the state is not changed.
bool line_wrapped(bool);
void border_renderer(std::function<void(graph_reference, const ::nana::expr_color& bgcolor)>);
void border_renderer(std::function<void(graph_reference, const ::nana::color& bgcolor)>);
bool load(const nana::char_t*);
@@ -227,7 +227,7 @@ namespace nana{ namespace widgets
skeletons::textbase<nana::char_t>& textbase();
const skeletons::textbase<nana::char_t>& textbase() const;
private:
::nana::expr_color _m_bgcolor() const;
::nana::color _m_bgcolor() const;
bool _m_scroll_text(bool vertical);
void _m_on_scroll(const arg_mouse&);
void _m_scrollbar();
@@ -262,7 +262,7 @@ namespace nana{ namespace widgets
//_m_draw_string
//@brief: Draw a line of string
void _m_draw_string(int top, const ::nana::expr_color&, const nana::upoint& str_pos, const nana::string&, bool if_mask) const;
void _m_draw_string(int top, const ::nana::color&, const nana::upoint& str_pos, const nana::string&, bool if_mask) const;
//_m_draw
//@brief: Draw a character at a position specified by caret pos.
//@return: true if beyond the border
@@ -308,7 +308,7 @@ namespace nana{ namespace widgets
unsigned scroll_pixels;
unsigned vscroll;
unsigned hscroll;
std::function<void(nana::paint::graphics&, const ::nana::expr_color&)> border_renderer;
std::function<void(nana::paint::graphics&, const ::nana::color&)> border_renderer;
}text_area_;
struct selection

4
include/nana/gui/widgets/skeletons/text_token_stream.hpp
View File

@@ -444,8 +444,8 @@ namespace nana{ namespace widgets{ namespace skeletons
bool bold;
bool bold_empty; //bold should be ignored if bold_empty is true
aligns::t text_align;
::nana::expr_color bgcolor; //If the color is not specified, it will be ignored, and the system will search for its parent.
::nana::expr_color fgcolor; //ditto
::nana::color bgcolor; //If the color is not specified, it will be ignored, and the system will search for its parent.
::nana::color fgcolor; //ditto
::nana::string target;
::nana::string url;

12
include/nana/gui/widgets/tabbar.hpp
View File

@@ -73,12 +73,12 @@ namespace nana
struct item_t
{
::nana::rectangle r;
::nana::expr_color bgcolor;
::nana::expr_color fgcolor;
::nana::color bgcolor;
::nana::color fgcolor;
};
virtual ~item_renderer() = default;
virtual void background(graph_reference, const nana::rectangle& r, const ::nana::expr_color& bgcolor) = 0;
virtual void background(graph_reference, const nana::rectangle& r, const ::nana::color& bgcolor) = 0;
virtual void item(graph_reference, const item_t&, bool active, state_t) = 0;
virtual void close_fly(graph_reference, const nana::rectangle&, bool active, state_t) = 0;
@@ -150,7 +150,7 @@ namespace nana
std::size_t length() const;
bool close_fly(bool);
void relate(size_t, window);
void tab_color(std::size_t, bool is_bgcolor, const ::nana::expr_color&);
void tab_color(std::size_t, bool is_bgcolor, const ::nana::color&);
void tab_image(size_t, const nana::paint::image&);
void text(std::size_t, const nana::string&);
nana::string text(std::size_t) const;
@@ -278,12 +278,12 @@ namespace nana
this->get_drawer_trigger().relate(pos, wd);
}
void tab_bgcolor(std::size_t i, const ::nana::expr_color& clr)
void tab_bgcolor(std::size_t i, const ::nana::color& clr)
{
this->get_drawer_trigger().tab_color(i, true, clr);
}
void tab_fgcolor(std::size_t i, const ::nana::expr_color& clr)
void tab_fgcolor(std::size_t i, const ::nana::color& clr)
{
this->get_drawer_trigger().tab_color(i, false, clr);
}

2
include/nana/gui/widgets/textbox.hpp
View File

@@ -79,7 +79,7 @@ namespace nana
void typeface_changed(graph_reference) override;
private:
void _m_text_area(unsigned width, unsigned height);
void _m_draw_border(graph_reference, const ::nana::expr_color& bgcolor);
void _m_draw_border(graph_reference, const ::nana::color& bgcolor);
private:
widget* widget_;
struct status_type

2
include/nana/gui/widgets/toolbar.hpp
View File

@@ -67,7 +67,7 @@ namespace nana
void mouse_up(graph_reference, const arg_mouse&) override;
private:
size_type _m_which(int x, int y, bool want_if_disabled) const;
void _m_draw_background(const ::nana::expr_color&);
void _m_draw_background(const ::nana::color&);
void _m_draw();
void _m_owner_sized(const arg_resized&);
private:

2
include/nana/gui/widgets/treebox.hpp
View File

@@ -74,7 +74,7 @@ namespace nana
virtual ~renderer_interface()
{}
virtual void set_color(const nana::expr_color& bgcolor, const nana::expr_color& fgcolor) = 0;
virtual void set_color(const nana::color& bgcolor, const nana::color& fgcolor) = 0;
virtual void bground(graph_reference, const compset_interface *) const = 0;
virtual void expander(graph_reference, const compset_interface *) const = 0;

16
include/nana/gui/widgets/widget.hpp
View File

@@ -73,10 +73,10 @@ namespace nana
void move(int x, int y);
void move(const rectangle&);
void fgcolor(const nana::expr_color&);
nana::expr_color fgcolor() const;
void bgcolor(const nana::expr_color&);
nana::expr_color bgcolor() const;
void fgcolor(const nana::color&);
nana::color fgcolor() const;
void bgcolor(const nana::color&);
nana::color bgcolor() const;
general_events& events() const;
@@ -110,10 +110,10 @@ namespace nana
virtual void _m_typeface(const nana::paint::font& font);
virtual nana::paint::font _m_typeface() const;
virtual void _m_fgcolor(const nana::expr_color&);
virtual nana::expr_color _m_fgcolor() const;
virtual void _m_bgcolor(const nana::expr_color&);
virtual nana::expr_color _m_bgcolor() const;
virtual void _m_fgcolor(const nana::color&);
virtual nana::color _m_fgcolor() const;
virtual void _m_bgcolor(const nana::color&);
virtual nana::color _m_bgcolor() const;
};
/// Base class of all the classes defined as a widget window. Defaultly a widget_tag

2
include/nana/paint/detail/image_processor.hpp
View File

@@ -405,7 +405,7 @@ namespace detail
class bresenham_line
: public image_process::line_interface
{
virtual void process(paint::pixel_buffer & pixbuf, const nana::point& pos_beg, const nana::point& pos_end, const ::nana::expr_color& clr, double fade_rate) const
virtual void process(paint::pixel_buffer & pixbuf, const nana::point& pos_beg, const nana::point& pos_end, const ::nana::color& clr, double fade_rate) const
{
auto rgb_color = clr.px_color().value;
const std::size_t bytes_pl = pixbuf.bytes_per_line();

6
include/nana/paint/gadget.hpp
View File

@@ -26,10 +26,10 @@ namespace gadget
enum t{to_east, to_southeast, to_south, to_southwest, to_west, to_northwest, to_north, to_northeast};
};
void arrow_16_pixels(nana::paint::graphics&, int x, int y, const expr_color&, uint32_t style, directions::t direction);
void close_16_pixels(nana::paint::graphics&, int x, int y, uint32_t style, const expr_color&);
void arrow_16_pixels(nana::paint::graphics&, int x, int y, const color&, uint32_t style, directions::t direction);
void close_16_pixels(nana::paint::graphics&, int x, int y, uint32_t style, const color&);
//void cross(nana::paint::graphics&, int x, int y, uint32_t size, uint32_t thickness, nana::color_t color); //deprecated
void cross(nana::paint::graphics&, int x, int y, uint32_t size, uint32_t thickness, const nana::expr_color&);
void cross(nana::paint::graphics&, int x, int y, uint32_t size, uint32_t thickness, const nana::color&);
}//end namespace gadget

24
include/nana/paint/graphics.hpp
View File

@@ -131,34 +131,34 @@ namespace nana
void release();
void save_as_file(const char*);
void set_color(const ::nana::expr_color&);
void set_text_color(const ::nana::expr_color&);
void set_color(const ::nana::color&);
void set_text_color(const ::nana::color&);
unsigned bidi_string(const nana::point&, const char_t *, std::size_t len);
void blend(const ::nana::rectangle& r, const ::nana::expr_color&, double fade_rate);
void blend(const ::nana::rectangle& r, const ::nana::color&, double fade_rate);
void set_pixel(int x, int y, const ::nana::expr_color&);
void set_pixel(int x, int y, const ::nana::color&);
void set_pixel(int x, int y);
void string(point, const char_t*, std::size_t len);
void string(const point&, const char_t*);
void string(const point&, const ::nana::string&);
void string(const point&, const ::nana::string&, const expr_color&);
void string(const point&, const ::nana::string&, const color&);
void line(const point&, const point&);
void line(const point&, const point&, const expr_color&);
void line_to(const point&, const expr_color&);
void line(const point&, const point&, const color&);
void line_to(const point&, const color&);
void line_to(const point&);
void rectangle(bool solid);
void rectangle(bool solid, const expr_color&);
void rectangle(bool solid, const color&);
void rectangle(const ::nana::rectangle&, bool solid);
void rectangle(const ::nana::rectangle&, bool solid, const expr_color&);
void frame_rectangle(const ::nana::rectangle&, const expr_color& left, const expr_color& top, const expr_color& right, const expr_color& bottom);
void rectangle(const ::nana::rectangle&, bool solid, const color&);
void frame_rectangle(const ::nana::rectangle&, const color& left, const color& top, const color& right, const color& bottom);
void gradual_rectangle(const ::nana::rectangle&, const expr_color& from, const expr_color& to, bool vertical);
void round_rectangle(const ::nana::rectangle&, unsigned radius_x, unsigned radius_y, const expr_color&, bool solid, const expr_color& color_if_solid);
void gradual_rectangle(const ::nana::rectangle&, const color& from, const color& to, bool vertical);
void round_rectangle(const ::nana::rectangle&, unsigned radius_x, unsigned radius_y, const color&, bool solid, const color& color_if_solid);
private:
std::shared_ptr< ::nana::detail::drawable_impl_type> dwptr_;
font font_shadow_;

2
include/nana/paint/image_process_interface.hpp
View File

@@ -68,7 +68,7 @@ namespace nana
virtual void process(paint::pixel_buffer & pixbuf,
const point& pos_beg, ///< left point
const point& pos_end, ///< right point
const ::nana::expr_color&,
const ::nana::color&,
double fade_rate ///< blend rate in the range of [0, 1] If not 0, the line is blended to the pixbuf
) const = 0;
};

6
include/nana/paint/pixel_buffer.hpp
View File

@@ -68,10 +68,10 @@ namespace nana{ namespace paint
void put(const unsigned char* rawbits, std::size_t width, std::size_t height, std::size_t bits_per_pixel, std::size_t bytes_per_line, bool is_negative);
void line(const std::string& name);
void line(const ::nana::point& pos_beg, const ::nana::point& pos_end, const ::nana::expr_color&, double fade_rate);
void line(const ::nana::point& pos_beg, const ::nana::point& pos_end, const ::nana::color&, double fade_rate);
void rectangle(const nana::rectangle&, const ::nana::expr_color&, double fade_rate, bool solid);
void gradual_rectangle(const ::nana::rectangle&, const ::nana::expr_color& from, const ::nana::expr_color& to, double fade_rate, bool vertical);
void rectangle(const nana::rectangle&, const ::nana::color&, double fade_rate, bool solid);
void gradual_rectangle(const ::nana::rectangle&, const ::nana::color& from, const ::nana::color& to, double fade_rate, bool vertical);
pixel_color_t pixel(int x, int y) const;
void pixel(int x, int y, pixel_color_t);