X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FToolbar.cc;h=12f778eba542523c8ebc4304e9e0bced9553ab9a;hb=18499a6920309d6ddfe70767f8a90e2778a96ba7;hp=a6da46a96ad26899172c964a40586a393313c338;hpb=940c1f614fa380a9153c3b81d0614201b27957c2;p=chaz%2Fopenbox

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index a6da46a9..12f778eb 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -68,11 +68,6 @@
 Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn),
   openbox(scrn.getOpenbox()), config(conf)
 {
-  // default values
-  m_width_percent =66;
-  m_placement = BottomCenter;
-  m_ontop = false;
-  m_hidden = m_autohide = false;
   load();
 
   // get the clock updating every minute
@@ -220,7 +215,7 @@ Toolbar::~Toolbar() {
 
 void Toolbar::setOnTop(bool b) {
   m_ontop = b;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".toolbar.onTop" << ends;
   config.setValue(s.str(), m_ontop ? "True" : "False");
   s.rdbuf()->freeze(0);
@@ -228,7 +223,7 @@ void Toolbar::setOnTop(bool b) {
 
 void Toolbar::setAutoHide(bool b) {
   m_autohide = b;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".toolbar.autoHide" <<
     ends;
   config.setValue(s.str(), m_autohide ? "True" : "False");
@@ -237,7 +232,7 @@ void Toolbar::setAutoHide(bool b) {
 
 void Toolbar::setWidthPercent(int w) {
   m_width_percent = w;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".toolbar.widthPercent"
     << ends;
   config.setValue(s.str(), m_width_percent);
@@ -246,7 +241,7 @@ void Toolbar::setWidthPercent(int w) {
 
 void Toolbar::setPlacement(int p) {
   m_placement = p;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".toolbar.placement" <<
     ends;
   const char *placement;
@@ -280,6 +275,8 @@ void Toolbar::load() {
   rclass << rscreen.str() << "Toolbar.WidthPercent" << ends;
   if (config.getValue(rname.str(), rclass.str(), l) && (l > 0 && l <= 100))
     m_width_percent = l;
+  else
+    m_width_percent =66;
 
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "toolbar.placement" << ends;
@@ -297,19 +294,25 @@ void Toolbar::load() {
       m_placement = BottomRight;
     else if ( 0 == strncasecmp(s.c_str(), "BottomCenter", s.length()))
       m_placement = BottomCenter;
-  }
+  } else
+    m_placement = BottomCenter;
   
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "toolbar.onTop" << ends;
   rclass << rscreen.str() << "Toolbar.OnTop" << ends;
   if (config.getValue(rname.str(), rclass.str(), b))
     m_ontop = b;
+  else
+    m_ontop = false;
 
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "toolbar.autoHide" << ends;
   rclass << rscreen.str() << "Toolbar.AutoHide" << ends;
   if (config.getValue(rname.str(), rclass.str(), b))
     m_hidden = m_autohide = b;
+  else
+    m_hidden = m_autohide = false;
+
   rscreen.rdbuf()->freeze(0);
   rname.rdbuf()->freeze(0);
   rclass.rdbuf()->freeze(0);