Merge branch 'leobackes-develop' into develop
This commit is contained in:
commit
ad94439206
@ -368,6 +368,9 @@ namespace nana
|
|||||||
item_proxy iter{ ess_, index_pair(pos_, size() - 1) };
|
item_proxy iter{ ess_, index_pair(pos_, size() - 1) };
|
||||||
if (set_value)
|
if (set_value)
|
||||||
iter.value(std::forward<T>(t));
|
iter.value(std::forward<T>(t));
|
||||||
|
|
||||||
|
update();
|
||||||
|
|
||||||
return iter;
|
return iter;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -441,6 +444,7 @@ namespace nana
|
|||||||
essence_t* ess_{nullptr};
|
essence_t* ess_{nullptr};
|
||||||
category_t* cat_{nullptr};
|
category_t* cat_{nullptr};
|
||||||
size_type pos_{0}; ///< Absolute position, not relative to display, and dont change during sort()
|
size_type pos_{0}; ///< Absolute position, not relative to display, and dont change during sort()
|
||||||
|
void update();
|
||||||
};
|
};
|
||||||
|
|
||||||
struct export_options
|
struct export_options
|
||||||
|
@ -4188,7 +4188,6 @@ namespace nana
|
|||||||
auto & m = cat_->items.back();
|
auto & m = cat_->items.back();
|
||||||
m.bgcolor = wd->bgcolor();
|
m.bgcolor = wd->bgcolor();
|
||||||
m.fgcolor = wd->fgcolor();
|
m.fgcolor = wd->fgcolor();
|
||||||
ess_->update();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4204,6 +4203,11 @@ namespace nana
|
|||||||
auto i = ess_->lister.get(pos_);
|
auto i = ess_->lister.get(pos_);
|
||||||
cat_ = &(*i);
|
cat_ = &(*i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cat_proxy::update() {
|
||||||
|
ess_->update();
|
||||||
|
}
|
||||||
|
|
||||||
//class cat_proxy
|
//class cat_proxy
|
||||||
|
|
||||||
//end class cat_proxy
|
//end class cat_proxy
|
||||||
|
Loading…
x
Reference in New Issue
Block a user