From b8aef00f1f3191834de4b7e7cbe4c8ee28580108 Mon Sep 17 00:00:00 2001 From: cilix42 Date: Fri, 5 Sep 2008 18:53:49 +0000 Subject: [PATCH] The page size table in Document Properties should use the available vertical space --- src/ui/dialog/document-properties.cpp | 12 +++++++++--- src/ui/widget/page-sizer.cpp | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index a69e8858f..a2d5b50ed 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -82,7 +82,7 @@ DocumentProperties::getInstance() DocumentProperties::DocumentProperties() : UI::Widget::Panel ("", "dialogs.documentoptions", SP_VERB_DIALOG_NAMEDVIEW), - _page_page(1, 1), _page_guides(1, 1), + _page_page(1, 1, true, true), _page_guides(1, 1), _page_snap(1, 1), _page_snap_dtls(1, 1), //--------------------------------------------------------------- _rcb_canb(_("Show page _border"), _("If set, rectangular page border is shown"), "showborder", _wr, false), @@ -196,9 +196,15 @@ attach_all(Gtk::Table &table, Gtk::Widget *const arr[], unsigned const n, int st } else { - if (arr[i+1]) + if (arr[i+1]) { + Gtk::AttachOptions yoptions = (Gtk::AttachOptions)0; + if (dynamic_cast(arr[i+1])) { + // only the PageSizer in Document Properties|Page should be stretched vertically + yoptions = Gtk::FILL|Gtk::EXPAND; + } table.attach(*arr[i+1], 1, 3, r, r+1, - Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); + Gtk::FILL|Gtk::EXPAND, yoptions, 0,0); + } else if (arr[i]) { Gtk::Label& label = reinterpret_cast(*arr[i]); diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index f193f04d2..15a9dc3f6 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -232,7 +232,7 @@ PageSizer::PageSizer(Registry & _wr) // _paperSizeListSelection->select(iter); - pack_start (_paperSizeListBox, false, false, 0); + pack_start (_paperSizeListBox, true, true, 0); _paperSizeListLabel.set_label(_("P_age size:")); _paperSizeListLabel.set_use_underline(); _paperSizeListBox.pack_start (_paperSizeListLabel, false, false, 0); -- 2.30.2