Get the layout engine working correctly (John Spray's patch.)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9055 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2004-10-06 09:22:52 +00:00
parent 38ca78e7ac
commit 06f456e0b4
2 changed files with 13 additions and 8 deletions

View File

@ -1,3 +1,8 @@
2004-10-06 John Spray <spray_john@users.sourceforge.net>
* GView.C (c-tor): get the layout engine working correctly by
invoking Gtk::PACK_EXPAND_WIDGET for the main LyX screen.
2004-10-04 John Spray <spray_john@users.sourceforge.net>
* The MathsMatrix dialog

View File

@ -47,19 +47,19 @@ void add_el(Gtk::Box::BoxList & list, Gtk::Box & box, bool shrink)
GView::GView()
{
// The physical store for the boxes making up the layout.
box_store_.push_back(boost::shared_ptr<Gtk::Box>(new Gtk::VBox));
box_store_.push_back(boost::shared_ptr<Gtk::Box>(new Gtk::HBox));
box_store_.push_back(boost::shared_ptr<Gtk::Box>(new Gtk::VBox));
box_store_.push_back(boost::shared_ptr<Gtk::Box>(new Gtk::HBox));
box_store_.push_back(boost::shared_ptr<Gtk::Box>(new Gtk::HBox));
box_store_.push_back(boost::shared_ptr<Gtk::Box>(new Gtk::HBox));
box_store_.push_back(BoxPtr(new Gtk::VBox));
box_store_.push_back(BoxPtr(new Gtk::HBox));
box_store_.push_back(BoxPtr(new Gtk::VBox));
box_store_.push_back(BoxPtr(new Gtk::HBox));
box_store_.push_back(BoxPtr(new Gtk::HBox));
box_store_.push_back(BoxPtr(new Gtk::HBox));
// Lay them out correctly.
add(top_box_);
Gtk::Box::BoxList & layout1 = top_box_.children();
add_el(layout1, *box_store_[0], true);
add_el(layout1, *box_store_[1], true);
add_el(layout1, *box_store_[1], false);
add_el(layout1, *box_store_[2], true);
Gtk::Box::BoxList & layout2 = box_store_[1]->children();
@ -88,7 +88,7 @@ GView::GView()
boost::bind(&GMiniBuffer::editMode, minibuffer_.get()));
view_state_changed.connect(boost::bind(&GView::showViewState, this));
signal_focus_in_event().connect(sigc::mem_fun(*this, &GView::onFocusIn));
set_default_size(500, 550);
set_default_size(620, 550);
// Make sure the buttons are disabled if needed.
updateToolbars();
string const iconName =