github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: ToolBar - fixed issue with embedded controls

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12671 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-01-15 22:03:54 +00:00
parent 296aa5fc0d
commit 917dabbddf
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlLib/Bar.cpp
View file

@ -533,6 +533,8 @@ void BarCtrl::Separator()
void BarCtrl::AddCtrl(Ctrl *ctrl, Size sz)
{
SizeCtrl& m = sizer.DoIndex(zii++);
while(m.GetFirstChild())
m.RemoveChild(m.GetFirstChild());
LogPos p = ctrl->GetPos();
if(p.x.IsEmpty()) {
if(sz.cx == INT_MAX)

2
uppsrc/CtrlLib/ToolBar.cpp
View file

@ -54,7 +54,7 @@ void ToolBar::Paint(Draw& w)
Bar::Item& ToolBar::AddItem(Event<> cb)
{
ToolButton& m = item.DoIndex(ii++);
ToolButton& m = item.At(ii++);
m.ResetKeepStyle();
m.WhenAction = cb;
m.MinSize(IsNull(buttonminsize) ? style->buttonminsize : buttonminsize);