aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-04-21 07:01:03 (GMT)
committerrathnor <rathnor>2003-04-21 07:01:03 (GMT)
commitc73329d363e7698a1e5294106c4160aac9519863 (patch)
tree0e740579885b4efff63385c13f7bf45ac708b0bb
parentbd9a39fde6cc3b43fd2cf1566ffc618359259441 (diff)
downloadfluxbox-c73329d363e7698a1e5294106c4160aac9519863.zip
fluxbox-c73329d363e7698a1e5294106c4160aac9519863.tar.bz2
some small fixes for toolbar init + reconfiging
-rw-r--r--ChangeLog9
-rw-r--r--RoadMap2
-rw-r--r--src/Screen.cc20
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 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.2: 2Changes for 0.9.2:
3*03/04/21:
4 * Fix toolbar startup and reconfigure things (Simon)
5 (Thanks Brian Sea)
6 Screen.cc
3*03/04/20: 7*03/04/20:
4 * Snap to Windows (and toolbar, slit + screen edge) (Simon) 8 * Snap to Windows (and toolbar, slit + screen edge) (Simon)
5 Window.hh/cc 9 Window.hh/cc
@@ -8,9 +12,10 @@ Changes for 0.9.2:
8 * Added transparent menus, session.screen<num>.menuAlpha (Henrik) 12 * Added transparent menus, session.screen<num>.menuAlpha (Henrik)
9 Menu.hh/cc, Transparent.hh/cc, Screen.hh/cc 13 Menu.hh/cc, Transparent.hh/cc, Screen.hh/cc
1002/04/17: 1402/04/17:
11 * Fixed menu bug 15 * Fixed menu bug (Henrik)
12 Menu.cc, Screen.cc 16 Menu.cc, Screen.cc
13 17 * Fixed saving of toolbar mode (Simon)
18 ToolbarHandler.cc
14-------------------------------------------------------------- 19--------------------------------------------------------------
15Changes for 0.9.1: 20Changes for 0.9.1:
16*03/04/16: 21*03/04/16:
diff --git a/RoadMap b/RoadMap
index c2cec55..3d961e6 100644
--- a/RoadMap
+++ b/RoadMap
@@ -103,7 +103,7 @@ Major Features:
103 = Transparency (Henrik) 103 = Transparency (Henrik)
104Minor Features: 104Minor Features:
105 - more keybinding actions (Both) 105 - more keybinding actions (Both)
106 * directional focus movement (?) 106 * directional focus movement (Simon)
107 - fix up focus issues (Simon) 107 - fix up focus issues (Simon)
108 * snap to windows (Simon) 108 * snap to windows (Simon)
109 - improved command-line help option (Henrik) 109 - 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 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.129 2003/04/20 13:46:18 fluxgen Exp $ 25// $Id: Screen.cc,v 1.130 2003/04/21 07:01:03 rathnor Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -652,9 +652,6 @@ BScreen::BScreen(ResourceManager &rm,
652 652
653 m_toolbarhandler = new ToolbarHandler(*this, getToolbarMode()); 653 m_toolbarhandler = new ToolbarHandler(*this, getToolbarMode());
654 654
655 if (getToolbar())
656 getToolbar()->setPlacement(*resource.toolbar_placement);
657
658 setupWorkspacemenu(*this, *workspacemenu); 655 setupWorkspacemenu(*this, *workspacemenu);
659 656
660 m_configmenu.reset(createMenuFromScreen(*this)); 657 m_configmenu.reset(createMenuFromScreen(*this));
@@ -663,8 +660,11 @@ BScreen::BScreen(ResourceManager &rm,
663 660
664 workspacemenu->setItemSelected(2, true); 661 workspacemenu->setItemSelected(2, true);
665 662
666 if (getToolbar() != 0) 663 if (getToolbar()) {
664 getToolbar()->setPlacement(*resource.toolbar_placement);
665 getToolbar()->theme().font().setAntialias(*resource.antialias);
667 getToolbar()->reconfigure(); 666 getToolbar()->reconfigure();
667 }
668 668
669 initMenu(); // create and initiate rootmenu 669 initMenu(); // create and initiate rootmenu
670 670
@@ -821,9 +821,6 @@ void BScreen::reconfigure() {
821 821
822 FbTk::ThemeManager::instance().load(filename.c_str()); // new theme engine 822 FbTk::ThemeManager::instance().load(filename.c_str()); // new theme engine
823 823
824 if (getToolbar())
825 getToolbar()->theme().font().setAntialias(*resource.antialias);
826
827 theme->reconfigure(*resource.antialias); 824 theme->reconfigure(*resource.antialias);
828 825
829 I18n *i18n = I18n::instance(); 826 I18n *i18n = I18n::instance();
@@ -876,12 +873,13 @@ void BScreen::reconfigure() {
876 m_rootmenu->reconfigure(); 873 m_rootmenu->reconfigure();
877 874
878 875
879 // m_toolbar->setPlacement(*resource.toolbar_placement); 876 if (getToolbar()) {
880 if (getToolbar() != 0) { 877 getToolbar()->setPlacement(*resource.toolbar_placement);
881 getToolbar()->reconfigure();
882 if (getToolbar()->theme().font().isAntialias() != *resource.antialias) 878 if (getToolbar()->theme().font().isAntialias() != *resource.antialias)
883 getToolbar()->theme().font().setAntialias(*resource.antialias); 879 getToolbar()->theme().font().setAntialias(*resource.antialias);
880 getToolbar()->reconfigure();
884 } 881 }
882
885#ifdef SLIT 883#ifdef SLIT
886 if (m_slit.get()) { 884 if (m_slit.get()) {
887 m_slit->setPlacement(static_cast<Slit::Placement>(getSlitPlacement())); 885 m_slit->setPlacement(static_cast<Slit::Placement>(getSlitPlacement()));