small changes
This commit is contained in:
parent
99a0cd2f8d
commit
24bbfc6493
@ -312,7 +312,14 @@ namespace nana
|
||||
/// @param lightness in range of [0, 1]
|
||||
color& from_hsl(double hue, double saturation, double lightness); ///< immutable alpha channel
|
||||
|
||||
color blend(const color& blending_color, double alpha) const;
|
||||
/// Blends color
|
||||
/**
|
||||
* Returns a color which is blended as this * (1 - fade_rate) + blending_color * fade_rate
|
||||
* @param blending_color Color to blend
|
||||
* @param fade_rate Blending rate for blending_color
|
||||
* @return a blended color
|
||||
*/
|
||||
color blend(const color& blending_color, double fade_rate) const;
|
||||
|
||||
/// Determines whether the color is completely transparent.
|
||||
bool invisible() const;
|
||||
|
||||
@ -219,8 +219,6 @@ namespace detail
|
||||
Key first;
|
||||
Value second;
|
||||
|
||||
key_value_rep() = default;
|
||||
|
||||
key_value_rep(const Key& k)
|
||||
: first(k), second{}
|
||||
{
|
||||
@ -258,15 +256,7 @@ namespace detail
|
||||
std::vector<key_value_rep> table_;
|
||||
};
|
||||
|
||||
//class window_manager
|
||||
struct window_handle_deleter
|
||||
{
|
||||
void operator()(basic_window* wd) const
|
||||
{
|
||||
delete wd;
|
||||
}
|
||||
};
|
||||
|
||||
//class window_manager
|
||||
//struct wdm_private_impl
|
||||
struct window_manager::wdm_private_impl
|
||||
{
|
||||
@ -506,7 +496,7 @@ namespace detail
|
||||
if (impl_->wd_register.available(owner))
|
||||
{
|
||||
if (owner->flags.destroying)
|
||||
throw std::runtime_error("the specified owner is destory");
|
||||
throw std::runtime_error("the specified owner is destoryed");
|
||||
|
||||
#ifndef WIDGET_FRAME_DEPRECATED
|
||||
native = (category::flags::frame == owner->other.category ?
|
||||
|
||||
@ -271,7 +271,7 @@ namespace paint
|
||||
|
||||
graphics::operator bool() const noexcept
|
||||
{
|
||||
return impl_->handle;
|
||||
return (impl_->handle != nullptr);
|
||||
}
|
||||
|
||||
drawable_type graphics::handle() const
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user