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

Improve spinbox

Browse Source
This commit is contained in:
cnjinhao
2015-01-23 03:27:21 +08:00
parent 4ff3a6afd5
commit 02b77d2a26
9 changed files with 200 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
/*
* A Basic Window Widget Definition
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at

5
include/nana/gui/widgets/combox.hpp
View File

@@ -1,7 +1,7 @@
/*
* A Combox Implementation
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@@ -52,8 +52,6 @@ namespace nana
trigger();
~trigger();
void set_accept(std::function<bool(nana::char_t)>&&);
drawer_impl& get_drawer_impl();
const drawer_impl& get_drawer_impl() const;
private:
@@ -70,7 +68,6 @@ namespace nana
void key_press(graph_reference, const arg_keyboard&) override;
void key_char(graph_reference, const arg_keyboard&) override;
private:
std::function<bool(nana::char_t)> pred_acceptive_;
drawer_impl * drawer_;
};

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

@@ -1,7 +1,7 @@
/*
* A text editor implementation
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@@ -131,17 +131,22 @@ namespace nana{ namespace widgets
struct keywords;
class keyword_parser;
public:
typedef ::nana::char_t char_type;
typedef textbase<char_type>::size_type size_type;
typedef textbase<char_type>::string_type string_type;
using char_type = ::nana::char_t;
using size_type = textbase<char_type>::size_type;
using string_type = textbase<char_type>::string_type;
typedef ::nana::paint::graphics & graph_reference;
using graph_reference = ::nana::paint::graphics&;
struct ext_renderer_tag
{
std::function<void(graph_reference, const nana::rectangle& text_area, const ::nana::color&)> background;
};
enum class accepts
{
no_restrict, integer, real
};
text_editor(window, graph_reference, const text_editor_scheme*);
~text_editor();
@@ -150,7 +155,9 @@ namespace nana{ namespace widgets
void set_keyword(const ::nana::string& kw, const std::string& name, bool case_sensitive, bool whole_word_matched);
void erase_keyword(const ::nana::string& kw);
bool respone_keyboard(nana::char_t, bool enterable);
void set_accept(std::function<bool(char_type)>);
void set_accept(accepts);
bool respone_keyboard(char_type);
void typeface_changed();
@@ -163,8 +170,8 @@ namespace nana{ namespace widgets
bool load(const nana::char_t*);
//text_area
//@return: Returns true if the area of text is changed.
/// Sets the text area.
/// @return true if the area is changed with the new value.
bool text_area(const nana::rectangle&);
bool tip_string(nana::string&&);
@@ -188,8 +195,7 @@ namespace nana{ namespace widgets
void text(nana::string);
nana::string text() const;
//move_caret
//@brief: Set caret position through text coordinate
/// Sets caret position through text coordinate.
void move_caret(const upoint&);
void move_caret_end();
void reset_caret_height() const;
@@ -198,7 +204,7 @@ namespace nana{ namespace widgets
bool selected() const;
bool select(bool);
//Set the end position of a selected string
/// Sets the end position of a selected string.
void set_end_caret();
bool hit_text_area(const point&) const;
bool hit_select_area(nana::upoint pos) const;
@@ -236,6 +242,7 @@ namespace nana{ namespace widgets
skeletons::textbase<nana::char_t>& textbase();
const skeletons::textbase<nana::char_t>& textbase() const;
private:
bool _m_accepts(char_type) const;
::nana::color _m_bgcolor() const;
bool _m_scroll_text(bool vertical);
void _m_on_scroll(const arg_mouse&);
@@ -253,17 +260,15 @@ namespace nana{ namespace widgets
unsigned _m_tabs_pixels(size_type tabs) const;
nana::size _m_text_extent_size(const char_type*, size_type n) const;
//_m_move_offset_x_while_over_border
//@brief: Moves the view window
/// Moves the view of window.
bool _m_move_offset_x_while_over_border(int many);
bool _m_move_select(bool record_undo);
int _m_text_top_base() const;
//_m_endx
//@brief: Gets the right point of text area
/// Returns the right point of text area.
int _m_endx() const;
//_m_endy
//@brief: Get the bottom point of text area
/// Returns the bottom point of text area.
int _m_endy() const;
void _m_draw_tip_string() const;
@@ -298,6 +303,9 @@ namespace nana{ namespace widgets
struct attributes
{
accepts acceptive{ accepts::no_restrict };
std::function<bool(char_type)> pred_acceptive;
nana::string tip_string;
bool line_wrapped{false};

27
include/nana/gui/widgets/spinbox.hpp
View File

@@ -47,6 +47,8 @@ namespace nana
void mouse_move(graph_reference, const arg_mouse&) override;
void mouse_up(graph_reference, const arg_mouse& arg) override;
void mouse_leave(graph_reference, const arg_mouse&) override;
void key_press(graph_reference, const arg_keyboard&) override;
void key_char(graph_reference, const arg_keyboard&) override;
private:
implementation * const impl_;
};
@@ -58,15 +60,40 @@ namespace nana
: public widget_object <category::widget_tag, drawerbase::spinbox::drawer, ::nana::general_events, ::nana::widgets::skeletons::text_editor_scheme>
{
public:
/// Constructs a spinbox.
spinbox();
spinbox(window, bool visible);
spinbox(window, const nana::rectangle& = {}, bool visible = true);
/// Sets the widget whether it accepts user keyboard input.
/// @param accept Set to indicate whether it accepts uesr keyboard input.
void editable(bool accept);
/// Determines whether the widget accepts user keyboard input.
bool editable() const;
/// Sets the numeric spin values and step.
void range(int begin, int last, int step);
void range(double begin, double last, double step);
/// Sets the string spin values.
void range(std::initializer_list<std::string> steps_utf8);
void range(std::initializer_list<std::wstring> steps);
/// Sets a predicator that determines whether accepts the current user input.
/// @param pred Predicator to determines the input.
void set_accept(std::function<bool(::nana::char_t)> pred);
/// Sets the spinbox that only accepts integer input.
void set_accept_integer();
/// Sets the spinbox that only accepts real number input.
void set_accept_real();
/// Removes the accept excluding predicate accept.
void remove_accept();
/// Sets the qualifications
void qualify(std::wstring prefix, std::wstring suffix);
void qualify(const std::string & prefix_utf8, const std::string& suffix_utf8);
private:

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

@@ -1,7 +1,7 @@
/*
* A Textbox Implementation
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@@ -62,7 +62,6 @@ namespace nana
drawer();
text_editor * editor();
const text_editor * editor() const;
void set_accept(std::function<bool(nana::char_t)> &&);
private:
void attached(widget_reference, graph_reference) override;
void detached() override;
@@ -82,7 +81,6 @@ namespace nana
void _m_text_area(unsigned width, unsigned height);
private:
widget* widget_;
std::function<bool(nana::char_t)> pred_acceptive_;
widgets::skeletons::text_editor * editor_;
std::unique_ptr<event_agent> evt_agent_;
};