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

Merge branch 'menubar_improvements' of https://github.com/dankan1890/nana into dankan1890-menubar_improvements

Browse Source
This commit is contained in:
Jinhao
2016-11-14 05:38:49 +08:00
parent 6043009c35 565b612ea7
commit 3de48c1991
3 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@
#ifndef NANA_GUI_WIDGETS_MENU_HPP
#define NANA_GUI_WIDGETS_MENU_HPP
#include "widget.hpp"
#include <nana/gui/widgets/widget.hpp>
#include <nana/pat/cloneable.hpp>
#include <nana/push_ignore_diagnostic>

21
include/nana/gui/widgets/menubar.hpp
View File

@@ -12,8 +12,8 @@
#ifndef NANA_GUI_WIDGETS_MENUBAR_HPP
#define NANA_GUI_WIDGETS_MENUBAR_HPP
#include "widget.hpp"
#include "menu.hpp"
#include <nana/gui/widgets/widget.hpp>
#include <nana/gui/widgets/menu.hpp>
#include <nana/push_ignore_diagnostic>
namespace nana
@@ -24,6 +24,16 @@ namespace nana
{
using native_string_type = ::nana::detail::native_string_type;
struct scheme
: public widget_geometrics
{
color_proxy text_fgcolor{ colors::black };
color_proxy body_highlight{ static_cast<color_rgb>(0xc0ddfc) };
color_proxy body_selected{ colors::white };
color_proxy border_selected{ colors::dark_border };
color_proxy border_highlight{ colors::highlight };
};
class item_renderer
{
public:
@@ -33,13 +43,16 @@ namespace nana
};
using graph_reference = paint::graphics&;
using scheme = ::nana::drawerbase::menubar::scheme;
item_renderer(window, graph_reference);
virtual void background(const point&, const ::nana::size&, state);
virtual void caption(const point&, const native_string_type&);
scheme *scheme_ptr() const { return scheme_ptr_; };
private:
window handle_;
graph_reference graph_;
scheme *scheme_ptr_;
};
class trigger
@@ -72,7 +85,7 @@ namespace nana
bool _m_track_mouse(const ::nana::point&);
private:
widget *widget_;
nana::paint::graphics *graph_;
paint::graphics *graph_;
itembase* items_;
@@ -104,7 +117,7 @@ namespace nana
///
/// The widget sets as shortkey the character behind the first of & in the text, for the item. e.g. "File(&F)" or "&File".
class menubar
: public widget_object<category::widget_tag, drawerbase::menubar::trigger>
: public widget_object<category::widget_tag, drawerbase::menubar::trigger, ::nana::general_events, drawerbase::menubar::scheme>
{
public:
menubar() = default; ///< The default constructor delay creation.