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

some small fixes for toolbar init + reconfiging

Browse source
This commit is contained in:
rathnor 2003-04-21 07:01:03 +00:00
parent bd9a39fde6
commit c73329d363
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,5 +1,9 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 0.9.2: Changes for 0.9.2:
*03/04/21:
* Fix toolbar startup and reconfigure things (Simon)
(Thanks Brian Sea)
Screen.cc
*03/04/20: *03/04/20:
* Snap to Windows (and toolbar, slit + screen edge) (Simon) * Snap to Windows (and toolbar, slit + screen edge) (Simon)
Window.hh/cc Window.hh/cc
@ -8,9 +12,10 @@ Changes for 0.9.2:
* Added transparent menus, session.screen<num>.menuAlpha (Henrik) * Added transparent menus, session.screen<num>.menuAlpha (Henrik)
Menu.hh/cc, Transparent.hh/cc, Screen.hh/cc Menu.hh/cc, Transparent.hh/cc, Screen.hh/cc
02/04/17: 02/04/17:
* Fixed menu bug * Fixed menu bug (Henrik)
Menu.cc, Screen.cc Menu.cc, Screen.cc
* Fixed saving of toolbar mode (Simon)
ToolbarHandler.cc
-------------------------------------------------------------- --------------------------------------------------------------
Changes for 0.9.1: Changes for 0.9.1:
*03/04/16: *03/04/16:

2
RoadMap
View file

@ -103,7 +103,7 @@ Major Features:
= Transparency (Henrik) = Transparency (Henrik)
Minor Features: Minor Features:
- more keybinding actions (Both) - more keybinding actions (Both)
* directional focus movement (?) * directional focus movement (Simon)
- fix up focus issues (Simon) - fix up focus issues (Simon)
* snap to windows (Simon) * snap to windows (Simon)
- improved command-line help option (Henrik) - improved command-line help option (Henrik)

20
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.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" #include "Screen.hh"
@ -652,9 +652,6 @@ BScreen::BScreen(ResourceManager &rm,
m_toolbarhandler = new ToolbarHandler(*this, getToolbarMode()); m_toolbarhandler = new ToolbarHandler(*this, getToolbarMode());
if (getToolbar())
getToolbar()->setPlacement(*resource.toolbar_placement);
setupWorkspacemenu(*this, *workspacemenu); setupWorkspacemenu(*this, *workspacemenu);
m_configmenu.reset(createMenuFromScreen(*this)); m_configmenu.reset(createMenuFromScreen(*this));
@ -663,8 +660,11 @@ BScreen::BScreen(ResourceManager &rm,
workspacemenu->setItemSelected(2, true); workspacemenu->setItemSelected(2, true);
if (getToolbar() != 0) if (getToolbar()) {
getToolbar()->setPlacement(*resource.toolbar_placement);
getToolbar()->theme().font().setAntialias(*resource.antialias);
getToolbar()->reconfigure(); getToolbar()->reconfigure();
}
initMenu(); // create and initiate rootmenu initMenu(); // create and initiate rootmenu
@ -821,9 +821,6 @@ void BScreen::reconfigure() {
FbTk::ThemeManager::instance().load(filename.c_str()); // new theme engine FbTk::ThemeManager::instance().load(filename.c_str()); // new theme engine
if (getToolbar())
getToolbar()->theme().font().setAntialias(*resource.antialias);
theme->reconfigure(*resource.antialias); theme->reconfigure(*resource.antialias);
I18n *i18n = I18n::instance(); I18n *i18n = I18n::instance();
@ -876,12 +873,13 @@ void BScreen::reconfigure() {
m_rootmenu->reconfigure(); m_rootmenu->reconfigure();
// m_toolbar->setPlacement(*resource.toolbar_placement); if (getToolbar()) {
if (getToolbar() != 0) { getToolbar()->setPlacement(*resource.toolbar_placement);
getToolbar()->reconfigure();
if (getToolbar()->theme().font().isAntialias() != *resource.antialias) if (getToolbar()->theme().font().isAntialias() != *resource.antialias)
getToolbar()->theme().font().setAntialias(*resource.antialias); getToolbar()->theme().font().setAntialias(*resource.antialias);
getToolbar()->reconfigure();
} }
#ifdef SLIT #ifdef SLIT
if (m_slit.get()) { if (m_slit.get()) {
m_slit->setPlacement(static_cast<Slit::Placement>(getSlitPlacement())); m_slit->setPlacement(static_cast<Slit::Placement>(getSlitPlacement()));