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

fixed a bground effect refresh issue.

Browse Source
This commit is contained in:
cnjinhao 2015-01-29 03:26:35 +08:00
parent a802083feb
commit e0259e6254
5 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,8 @@ namespace detail
bool dropable :1; //Whether the window has make mouse_drop event.
bool fullscreen :1; //When the window is maximizing whether it fit for fullscreen.
bool borderless :1;
unsigned Reserved :22;
bool make_bground_declared : 1; //explicitly make bground for bground effects
unsigned Reserved :21;
unsigned char tab; //indicate a window that can receive the keyboard TAB
mouse_action action;
}flags;
@ -175,7 +176,7 @@ namespace detail
general_events* attached_events;
}together;
widget_colors* expr_colors{ nullptr };
widget_colors* scheme{ nullptr };
struct
{

4
include/nana/gui/detail/effects_renderer.hpp
View File

@ -119,12 +119,12 @@ namespace nana{
good_r.x = good_r.y = 1;
good_r.width = r.width - 2;
good_r.height = r.height - 2;
pixbuf.rectangle(good_r, wd->expr_colors->activated.get_color(), 0.95, false);
pixbuf.rectangle(good_r, wd->scheme->activated.get_color(), 0.95, false);
good_r.x = good_r.y = 0;
good_r.width = r.width;
good_r.height = r.height;
pixbuf.rectangle(good_r, wd->expr_colors->activated.get_color(), 0.4, false);
pixbuf.rectangle(good_r, wd->scheme->activated.get_color(), 0.4, false);
pixbuf.pixel(0, 0, px0);
pixbuf.pixel(r.width - 1, 0, px1);

1
source/gui/detail/basic_window.cpp
View File

@ -339,6 +339,7 @@ namespace nana
flags.refreshing = false;
flags.destroying = false;
flags.borderless = false;
flags.make_bground_declared = false;
visible = false;

8
source/gui/detail/window_layout.cpp
View File

@ -308,8 +308,14 @@ namespace nana
{
if (is_redraw || called_by_notify)
{
if (called_by_notify)
//The background is made by more than calling by notification(such as redraw of parent,
//redraw of siblings which are covered by wd), sometimes it should be remade when an attribute
//of the wd is changed(such as its background color is changed).
if (called_by_notify || wd->flags.make_bground_declared)
{
make_bground(wd);
wd->flags.make_bground_declared = false;
}
wd->flags.refreshing = true;
wd->drawer.refresh();

33
source/gui/programming_interface.cpp
View File

@ -110,6 +110,10 @@ namespace API
iwd->effect.bground = new_effect_ptr;
iwd->effect.bground_fade_rate = fade_rate;
restrict::window_manager.enable_effects_bground(iwd, true);
if (fade_rate < 0.01)
iwd->flags.make_bground_declared = true;
API::refresh_window(wd);
}
}
@ -155,14 +159,14 @@ namespace API
auto iwd = reinterpret_cast<restrict::core_window_t*>(wd);
internal_scope_guard lock;
if (restrict::window_manager.available(iwd))
iwd->expr_colors = wdg_colors;
iwd->scheme = wdg_colors;
}
widget_colors* get_scheme(window wd)
{
auto iwd = reinterpret_cast<restrict::core_window_t*>(wd);
internal_scope_guard lock;
return (restrict::window_manager.available(iwd) ? iwd->expr_colors : nullptr);
return (restrict::window_manager.available(iwd) ? iwd->scheme : nullptr);
}
void attach_drawer(widget& wd, drawer_trigger& dr)
@ -172,7 +176,7 @@ namespace API
if(restrict::window_manager.available(iwd))
{
iwd->drawer.graphics.make(iwd->dimension);
iwd->drawer.graphics.rectangle(true, iwd->expr_colors->background.get_color());
iwd->drawer.graphics.rectangle(true, iwd->scheme->background.get_color());
iwd->drawer.attached(wd, dr);
iwd->drawer.refresh(); //Always redrawe no matter it is visible or invisible. This can make the graphics data correctly.
}
@ -805,7 +809,7 @@ namespace API
{
internal_scope_guard lock;
if (restrict::window_manager.available(reinterpret_cast<restrict::core_window_t*>(wd)))
return reinterpret_cast<restrict::core_window_t*>(wd)->expr_colors->foreground.get_color();
return reinterpret_cast<restrict::core_window_t*>(wd)->scheme->foreground.get_color();
return{};
}
@ -815,10 +819,10 @@ namespace API
internal_scope_guard lock;
if (restrict::window_manager.available(iwd))
{
auto prev = iwd->expr_colors->foreground.get_color();
auto prev = iwd->scheme->foreground.get_color();
if (prev != clr)
{
iwd->expr_colors->foreground = clr;
iwd->scheme->foreground = clr;
restrict::window_manager.update(iwd, true, false);
}
return prev;
@ -830,7 +834,7 @@ namespace API
{
internal_scope_guard lock;
if (restrict::window_manager.available(reinterpret_cast<restrict::core_window_t*>(wd)))
return reinterpret_cast<restrict::core_window_t*>(wd)->expr_colors->background.get_color();
return reinterpret_cast<restrict::core_window_t*>(wd)->scheme->background.get_color();
return{};
}
@ -840,10 +844,15 @@ namespace API
internal_scope_guard lock;
if (restrict::window_manager.available(iwd))
{
auto prev = iwd->expr_colors->background.get_color();
auto prev = iwd->scheme->background.get_color();
if (prev != clr)
{
iwd->expr_colors->background = clr;
iwd->scheme->background = clr;
//If the bground mode of this window is basic, it should remake the background
if (iwd->effect.bground && iwd->effect.bground_fade_rate < 0.01) // fade rate < 0.01 means it is basic mode
iwd->flags.make_bground_declared = true;
restrict::window_manager.update(iwd, true, false);
}
return prev;
@ -855,7 +864,7 @@ namespace API
{
internal_scope_guard lock;
if (restrict::window_manager.available(reinterpret_cast<restrict::core_window_t*>(wd)))
return reinterpret_cast<restrict::core_window_t*>(wd)->expr_colors->activated.get_color();
return reinterpret_cast<restrict::core_window_t*>(wd)->scheme->activated.get_color();
return{};
}
@ -865,10 +874,10 @@ namespace API
internal_scope_guard lock;
if (restrict::window_manager.available(iwd))
{
auto prev = iwd->expr_colors->activated.get_color();
auto prev = iwd->scheme->activated.get_color();
if (prev != clr)
{
iwd->expr_colors->activated = clr;
iwd->scheme->activated = clr;
restrict::window_manager.update(iwd, true, false);
}
return prev;