From c73329d363e7698a1e5294106c4160aac9519863 Mon Sep 17 00:00:00 2001 From: rathnor Date: Mon, 21 Apr 2003 07:01:03 +0000 Subject: some small fixes for toolbar init + reconfiging --- ChangeLog | 9 +++++++-- RoadMap | 2 +- src/Screen.cc | 20 +++++++++----------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a1d287..856370f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ (Format: Year/Month/Day) Changes for 0.9.2: +*03/04/21: + * Fix toolbar startup and reconfigure things (Simon) + (Thanks Brian Sea) + Screen.cc *03/04/20: * Snap to Windows (and toolbar, slit + screen edge) (Simon) Window.hh/cc @@ -8,9 +12,10 @@ Changes for 0.9.2: * Added transparent menus, session.screen.menuAlpha (Henrik) Menu.hh/cc, Transparent.hh/cc, Screen.hh/cc 02/04/17: - * Fixed menu bug + * Fixed menu bug (Henrik) Menu.cc, Screen.cc - + * Fixed saving of toolbar mode (Simon) + ToolbarHandler.cc -------------------------------------------------------------- Changes for 0.9.1: *03/04/16: diff --git a/RoadMap b/RoadMap index c2cec55..3d961e6 100644 --- a/RoadMap +++ b/RoadMap @@ -103,7 +103,7 @@ Major Features: = Transparency (Henrik) Minor Features: - more keybinding actions (Both) - * directional focus movement (?) + * directional focus movement (Simon) - fix up focus issues (Simon) * snap to windows (Simon) - improved command-line help option (Henrik) diff --git a/src/Screen.cc b/src/Screen.cc index c8275a0..25f75a7 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Screen.cc,v 1.129 2003/04/20 13:46:18 fluxgen Exp $ +// $Id: Screen.cc,v 1.130 2003/04/21 07:01:03 rathnor Exp $ #include "Screen.hh" @@ -652,9 +652,6 @@ BScreen::BScreen(ResourceManager &rm, m_toolbarhandler = new ToolbarHandler(*this, getToolbarMode()); - if (getToolbar()) - getToolbar()->setPlacement(*resource.toolbar_placement); - setupWorkspacemenu(*this, *workspacemenu); m_configmenu.reset(createMenuFromScreen(*this)); @@ -663,8 +660,11 @@ BScreen::BScreen(ResourceManager &rm, workspacemenu->setItemSelected(2, true); - if (getToolbar() != 0) + if (getToolbar()) { + getToolbar()->setPlacement(*resource.toolbar_placement); + getToolbar()->theme().font().setAntialias(*resource.antialias); getToolbar()->reconfigure(); + } initMenu(); // create and initiate rootmenu @@ -821,9 +821,6 @@ void BScreen::reconfigure() { FbTk::ThemeManager::instance().load(filename.c_str()); // new theme engine - if (getToolbar()) - getToolbar()->theme().font().setAntialias(*resource.antialias); - theme->reconfigure(*resource.antialias); I18n *i18n = I18n::instance(); @@ -876,12 +873,13 @@ void BScreen::reconfigure() { m_rootmenu->reconfigure(); - // m_toolbar->setPlacement(*resource.toolbar_placement); - if (getToolbar() != 0) { - getToolbar()->reconfigure(); + if (getToolbar()) { + getToolbar()->setPlacement(*resource.toolbar_placement); if (getToolbar()->theme().font().isAntialias() != *resource.antialias) getToolbar()->theme().font().setAntialias(*resource.antialias); + getToolbar()->reconfigure(); } + #ifdef SLIT if (m_slit.get()) { m_slit->setPlacement(static_cast(getSlitPlacement())); -- cgit v0.11.2