From b15b581f57571c7241eb72b493e560d7af3789d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Tue, 31 Oct 2006 13:59:22 +0000 Subject: [PATCH] * frontends/Toolbars.C: revert first patch http://www.lyx.org/trac/changeset/15597 * frontends/qt4/GuiView.C: don't 'break' the toolbar because it doesn't work if the toolbar will be hidden git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15636 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/Toolbars.C | 5 +++++ src/frontends/qt4/GuiView.C | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/frontends/Toolbars.C b/src/frontends/Toolbars.C index 6529298628..a5b7273739 100644 --- a/src/frontends/Toolbars.C +++ b/src/frontends/Toolbars.C @@ -124,6 +124,11 @@ void Toolbars::add(ToolbarBackend::Toolbar const & tbb) ToolbarPtr tb_ptr = owner_.makeToolbar(tbb); toolbars_[tbb.name] = tb_ptr; + if (tbb.flags & ToolbarBackend::ON) + tb_ptr->show(false); + else + tb_ptr->hide(false); + if (tb_ptr->layout()) layout_ = tb_ptr->layout(); } diff --git a/src/frontends/qt4/GuiView.C b/src/frontends/qt4/GuiView.C index ed81ade5e0..d56fced42e 100644 --- a/src/frontends/qt4/GuiView.C +++ b/src/frontends/qt4/GuiView.C @@ -323,9 +323,13 @@ Toolbars::ToolbarPtr GuiView::makeToolbar(ToolbarBackend::Toolbar const & tbb) } if (tbb.flags & ToolbarBackend::BOTTOM) { addToolBar(Qt::BottomToolBarArea, Tb); + /* + // Qt bug. Doesn't work because the + // toolbar will evtl. be hidden. if (lastTb) insertToolBarBreak(lastTb); lastTb = Tb; + */ } if (tbb.flags & ToolbarBackend::LEFT) { addToolBar(Qt::LeftToolBarArea, Tb); -- 2.39.2