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

Bazaar/XMLMenu : allow XMLMenuize controls with embedded frames

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4208 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
micio 2011-11-29 10:04:05 +00:00
parent e5a5c38f9d
commit bdfb65abdc
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
bazaar/XMLMenu/WithXMLMenu.h
View file

@ -175,8 +175,22 @@ template<class T> WithXMLMenu<T>::~WithXMLMenu()
template<class T> void WithXMLMenu<T>::RefreshFrames(void)
{
// removes all frames
T::ClearFrames();
// T::ClearFrames();
T::RemoveFrame(topFrame);
T::RemoveFrame(bottomFrame);
T::RemoveFrame(leftFrame);
T::RemoveFrame(rightFrame);
// add docking frames
if(dockTop)
T::InsertFrame(0, topFrame);
if(dockBottom)
T::InsertFrame(0, bottomFrame);
if(dockLeft)
T::InsertFrame(0, leftFrame);
if(dockRight)
T::InsertFrame(0, rightFrame);
// adds main menu
if(mainMenu)
{
@ -184,19 +198,11 @@ template<class T> void WithXMLMenu<T>::RefreshFrames(void)
if(mainIdx >= 0)
{
MenuBar &bar = menuBarCtrls[mainIdx];
T::AddFrame(bar);
T::RemoveFrame(bar);
T::InsertFrame(0, bar);
}
}
// add docking frames
if(dockTop)
T::AddFrame(topFrame);
if(dockBottom)
T::AddFrame(bottomFrame);
if(dockLeft)
T::AddFrame(leftFrame);
if(dockRight)
T::AddFrame(rightFrame);
}
@ -505,7 +511,13 @@ template<class T> void WithXMLMenu<T>::SetToolBar0(Bar &bar, int tbIdx, Array<XM
// refresh menus and bars
template<class T> void WithXMLMenu<T>::RefreshBars(void)
{
T::ClearFrames();
// T::ClearFrames();
T::RemoveFrame(topFrame);
T::RemoveFrame(bottomFrame);
T::RemoveFrame(leftFrame);
T::RemoveFrame(rightFrame);
for(int iBar = 0; iBar < menuBarCtrls.GetCount(); iBar++)
T::RemoveFrame(menuBarCtrls[iBar]);
// refresh menus
menuBarCtrls.Clear();