nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

toolbar placement in resource

Browse source
This commit is contained in:
fluxgen 2002-12-04 22:43:18 +00:00
parent b69bb1d0f8
commit 5af8543e8a
1 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.90 2002/12/02 23:19:16 fluxgen Exp $ // $Id: Screen.cc,v 1.91 2002/12/04 22:43:18 fluxgen Exp $
#include "Screen.hh" #include "Screen.hh"
@ -158,6 +158,18 @@ setFromString(const char *strval) {
m_value = Toolbar::TOPRIGHT; m_value = Toolbar::TOPRIGHT;
else if (strcasecmp(strval, "BottomRight")==0) else if (strcasecmp(strval, "BottomRight")==0)
m_value = Toolbar::BOTTOMRIGHT; m_value = Toolbar::BOTTOMRIGHT;
else if (strcasecmp(strval, "LeftTop") == 0)
m_value = Toolbar::LEFTTOP;
else if (strcasecmp(strval, "LeftCenter") == 0)
m_value = Toolbar::LEFTCENTER;
else if (strcasecmp(strval, "LeftBottom") == 0)
m_value = Toolbar::LEFTBOTTOM;
else if (strcasecmp(strval, "RightTop") == 0)
m_value = Toolbar::RIGHTTOP;
else if (strcasecmp(strval, "RightCenter") == 0)
m_value = Toolbar::RIGHTCENTER;
else if (strcasecmp(strval, "RightBottom") == 0)
m_value = Toolbar::RIGHTBOTTOM;
else else
setDefaultValue(); setDefaultValue();
} }
@ -178,6 +190,7 @@ getString() {
template<> template<>
string Resource<Toolbar::Placement>:: string Resource<Toolbar::Placement>::
getString() { getString() {
cerr<<"m_value = "<<m_value<<endl;
switch (m_value) { switch (m_value) {
case Toolbar::TOPLEFT: case Toolbar::TOPLEFT:
return string("TopLeft"); return string("TopLeft");
@ -197,6 +210,24 @@ getString() {
case Toolbar::BOTTOMRIGHT: case Toolbar::BOTTOMRIGHT:
return string("BottomRight"); return string("BottomRight");
break; break;
case Toolbar::LEFTTOP:
return string("LeftTop");
break;
case Toolbar::LEFTCENTER:
return string("LeftCenter");
break;
case Toolbar::LEFTBOTTOM:
return string("LeftBottom");
break;
case Toolbar::RIGHTTOP:
return string("RightTop");
break;
case Toolbar::RIGHTCENTER:
return string("RightCenter");
break;
case Toolbar::RIGHTBOTTOM:
return string("RightBottom");
break;
} }
//default string //default string
return string("BottomCenter"); return string("BottomCenter");
@ -383,6 +414,8 @@ BScreen::BScreen(ResourceManager &rm,
workspacemenu->setItemSelected(2, true); workspacemenu->setItemSelected(2, true);
m_toolbar.reset(new Toolbar(this)); m_toolbar.reset(new Toolbar(this));
m_toolbar->setPlacement(*resource.toolbar_placement);
m_toolbar->reconfigure();
#ifdef SLIT #ifdef SLIT
m_slit.reset(new Slit(this)); m_slit.reset(new Slit(this));
@ -598,11 +631,11 @@ void BScreen::reconfigure() {
rootmenu->drawSubmenu(remember_sub); rootmenu->drawSubmenu(remember_sub);
} }
m_toolbar->setPlacement(*resource.toolbar_placement);
m_toolbar->reconfigure(); m_toolbar->reconfigure();
if (m_toolbar->theme().font().isAntialias() != *resource.antialias) if (m_toolbar->theme().font().isAntialias() != *resource.antialias)
m_toolbar->theme().font().setAntialias(*resource.antialias); m_toolbar->theme().font().setAntialias(*resource.antialias);
m_toolbar->setPlacement(*resource.toolbar_placement);
if (m_slit.get()) if (m_slit.get())
m_slit->reconfigure(); m_slit->reconfigure();