diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-04-17 23:07:11 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-04-17 23:07:11 +0000 |
| commit | 307da13fff916694f870ecb77aaf3ce0cf51d09e (patch) | |
| tree | ed958a10e8651c42edafb00a321355ef8f1e0833 /src/Screen.cc | |
| parent | 9cd9d92bb1d66db9329bf5cd6e42e8b0096945e6 (diff) | |
menus update their values when they are reconfigure()d.
the screen, toolbar and slit rc values are reloaded in BScreen::reconfigure() before the menus.
the toolbar and slit rc values are explicitly loaded in their constructors, as is BScreen's.
Diffstat (limited to 'src/Screen.cc')
| -rw-r--r-- | src/Screen.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 251faadd..50bc4ceb 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -249,9 +249,6 @@ BScreen::BScreen(Openbox &ob, int scrn, Resource &conf) : ScreenInfo(ob, scrn), openbox.getSessionCursor()); workspaceNames = new LinkedList<char>; - - load(); // load config options from Resources - workspacesList = new LinkedList<Workspace>; rootmenuList = new LinkedList<Rootmenu>; netizenList = new LinkedList<Netizen>; @@ -265,6 +262,7 @@ BScreen::BScreen(Openbox &ob, int scrn, Resource &conf) : ScreenInfo(ob, scrn), image_control->setDither(resource.image_dither); + load(); // load config options from Resources LoadStyle(); XGCValues gcv; @@ -1040,7 +1038,8 @@ void BScreen::save() { #ifdef HAVE_STRFTIME // it deletes the current value before setting the new one, so we have to // duplicate the current value. - setStrftimeFormat(bstrdup(resource.strftime_format)); + std::string s = resource.strftime_format; + setStrftimeFormat(s.c_str()); #else // !HAVE_STRFTIME setDateFormat(resource.date_format); setClock24Hour(resource.clock24hour); @@ -1211,6 +1210,10 @@ void BScreen::load() { void BScreen::reconfigure(void) { load(); + toolbar->load(); +#ifdef SLIT + slit->load(); +#endif // SLIT LoadStyle(); XGCValues gcv; |