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

Refined code

Browse Source 
refined code and implemented select all(ctrl+a) for text_editor
This commit is contained in:
cnjinhao
2014-12-21 08:15:18 +08:00
parent e64b6ec2b2
commit e5aeb8420f
7 changed files with 326 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
include/nana/gui/basis.hpp
View File

@@ -71,30 +71,31 @@ namespace nana
struct keyboard
{
enum t{
enum{
//Control Code for ASCII
select_all = 0x1,
end_of_text = 0x3, //Ctrl+C
backspace = 0x8, tab = 0x9,
enter_n = 0xA, enter = 0xD, enter_r = 0xD,
alt = 0x12,
sync_idel = 0x16, //Ctrl+V
cancel = 0x18, //Ctrl+X
end_of_medium = 0x19, //Ctrl+Y
substitute = 0x1A, //Ctrl+Z
escape = 0x1B,
start_of_headline = 0x1, //Ctrl+A
end_of_text = 0x3, //Ctrl+C
backspace = 0x8, tab = 0x9,
enter_n = 0xA, enter = 0xD, enter_r = 0xD,
alt = 0x12,
sync_idel = 0x16, //Ctrl+V
cancel = 0x18, //Ctrl+X
end_of_medium = 0x19, //Ctrl+Y
substitute = 0x1A, //Ctrl+Z
escape = 0x1B,
//The following names are intuitive name of ASCII control codes
copy = 0x3, //end_of_text
paste = 0x16, //sync_idel
cut = 0x18, //cancel
redo = 0x19, //end_of_medium
undo = 0x1A, //substitue
select_all = start_of_headline,
copy = end_of_text,
paste = sync_idel,
cut = cancel,
redo = end_of_medium,
undo = substitute,
//System Code for OS
os_pageup = 0x21, os_pagedown,
os_arrow_left = 0x25, os_arrow_up, os_arrow_right, os_arrow_down,
os_insert = 0x2D, os_del
os_pageup = 0x21, os_pagedown,
os_arrow_left = 0x25, os_arrow_up, os_arrow_right, os_arrow_down,
os_insert = 0x2D, os_del
};
};

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

@@ -1,6 +1,7 @@
/*
* Pixel Buffer Implementation
* Copyright(C) 2003-2013 Jinhao(cnjinhao@hotmail.com)
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@@ -19,14 +20,14 @@ namespace nana{ namespace paint
{
///@brief Seek a pixel address by using offset bytes
///@return the specified pixel address
inline pixel_argb_t * pixel_at(pixel_argb_t * p, std::size_t bytes)
inline pixel_color_t * pixel_at(pixel_color_t * p, std::size_t bytes)
{
return reinterpret_cast<pixel_argb_t*>(reinterpret_cast<char*>(p) + bytes);
return reinterpret_cast<pixel_color_t*>(reinterpret_cast<char*>(p)+bytes);
}
inline const pixel_argb_t * pixel_at(const pixel_argb_t * p, std::size_t bytes)
inline const pixel_color_t * pixel_at(const pixel_color_t * p, std::size_t bytes)
{
return reinterpret_cast<const pixel_argb_t*>(reinterpret_cast<const char*>(p) + bytes);
return reinterpret_cast<const pixel_color_t*>(reinterpret_cast<const char*>(p)+bytes);
}
class pixel_buffer
@@ -34,7 +35,7 @@ namespace nana{ namespace paint
struct pixel_buffer_storage;
typedef bool (pixel_buffer:: * unspecified_bool_t)() const;
public:
pixel_buffer();
pixel_buffer() = default;
pixel_buffer(drawable_type, const nana::rectangle& want_rectangle);
pixel_buffer(drawable_type, std::size_t top, std::size_t lines);
pixel_buffer(std::size_t width, std::size_t height);
@@ -60,9 +61,9 @@ namespace nana{ namespace paint
std::size_t bytes_per_line() const;
nana::size size() const;
pixel_argb_t * at(const point& pos) const;
pixel_argb_t * raw_ptr(std::size_t row) const;
pixel_argb_t * operator[](std::size_t row) const;
pixel_color_t * at(const point& pos) const;
pixel_color_t * raw_ptr(std::size_t row) const;
pixel_color_t * operator[](std::size_t row) const;
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);
@@ -70,11 +71,10 @@ namespace nana{ namespace paint
void line(const ::nana::point& pos_beg, const ::nana::point& pos_end, const ::nana::expr_color&, double fade_rate);
void rectangle(const nana::rectangle&, const ::nana::expr_color&, double fade_rate, bool solid);
//void shadow_rectangle(const nana::rectangle&, nana::color_t beg, nana::color_t end, double fade_rate, bool vertical); //deprecated
void gradual_rectangle(const ::nana::rectangle&, const ::nana::expr_color& from, const ::nana::expr_color& to, double fade_rate, bool vertical);
pixel_argb_t pixel(int x, int y) const;
void pixel(int x, int y, pixel_argb_t);
pixel_color_t pixel(int x, int y) const;
void pixel(int x, int y, pixel_color_t);
void paste(drawable_type, int x, int y) const;
void paste(const nana::rectangle& s_r, drawable_type, int x, int y) const;