diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-09-02 03:33:52 +0000 |
|---|---|---|
| committer | John Smith <john.smith7545@yahoo.com> | 2012-09-02 03:33:52 +0000 |
| commit | 790fa90c6d84ff8ef53f19bb2bb0b75999242d2c (patch) | |
| tree | 4405a273698430b63f57b5b4b8da0959277c862e /src | |
| parent | emf import. add support for EMR_PIE element (Bug 1040339) (diff) | |
| download | inkscape-790fa90c6d84ff8ef53f19bb2bb0b75999242d2c.tar.gz inkscape-790fa90c6d84ff8ef53f19bb2bb0b75999242d2c.zip | |
Fix for 747998 : Align unit menu in Rows Columns dialog
(bzr r11639)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/tile.cpp | 22 | ||||
| -rw-r--r-- | src/ui/dialog/tile.h | 3 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp index 77dae056f..5031a60b6 100644 --- a/src/ui/dialog/tile.cpp +++ b/src/ui/dialog/tile.cpp @@ -124,7 +124,7 @@ void TileDialog::Grid_Arrange () { int cnt,row_cnt,col_cnt,a,row,col; - double grid_left,grid_top,col_width,row_height,paddingx,paddingy,width, height, new_x, new_y,cx,cy; + double grid_left,grid_top,col_width,row_height,paddingx,paddingy,width, height, new_x, new_y; double total_col_width,total_row_height; col_width = 0; row_height = 0; @@ -175,9 +175,6 @@ void TileDialog::Grid_Arrange () width = b->dimensions()[Geom::X]; height = b->dimensions()[Geom::Y]; - cx = b->midpoint()[Geom::X]; - cy = b->midpoint()[Geom::Y]; - if (b->min()[Geom::X] < grid_left) { grid_left = b->min()[Geom::X]; } @@ -615,8 +612,9 @@ static void updateSelectionCallback(Inkscape::Application */*inkscape*/, Inkscap */ TileDialog::TileDialog() : UI::Widget::Panel("", "/dialogs/gridtiler", SP_VERB_SELECTION_GRIDTILE), - XPadding(_("X:"), _("Horizontal spacing between columns."), UNIT_TYPE_LINEAR, "", "object-columns"), - YPadding(_("Y:"), _("Vertical spacing between rows."), XPadding, "", "object-rows") + XPadding(_("X:"), _("Horizontal spacing between columns."), UNIT_TYPE_LINEAR, "", "object-columns", &PaddingUnitMenu), + YPadding(_("Y:"), _("Vertical spacing between rows."), UNIT_TYPE_LINEAR, "", "object-rows", &PaddingUnitMenu), + PaddingTable(2, 2, false) { // bool used by spin button callbacks to stop loops where they change each other. updating = false; @@ -817,6 +815,8 @@ TileDialog::TileDialog() { /*#### Padding ####*/ + PaddingUnitMenu.setUnitType(UNIT_TYPE_LINEAR); + PaddingUnitMenu.setUnit("px"); YPadding.setDigits(5); YPadding.setIncrements(0.2, 0); @@ -833,8 +833,14 @@ TileDialog::TileDialog() XPadding.signal_value_changed().connect(sigc::mem_fun(*this, &TileDialog::on_xpad_spinbutton_changed)); } - TileBox.pack_start(XPadding, false, false, MARGIN); - TileBox.pack_start(YPadding, false, false, MARGIN); + + PaddingTable.set_border_width(MARGIN); + PaddingTable.set_row_spacings(MARGIN); + PaddingTable.set_col_spacings(MARGIN); + PaddingTable.attach(XPadding, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK); + PaddingTable.attach(PaddingUnitMenu, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK); + PaddingTable.attach(YPadding, 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK); + TileBox.pack_start(PaddingTable, false, false, MARGIN); contents->pack_start(TileBox); diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h index f9e9d9842..884cd3bae 100644 --- a/src/ui/dialog/tile.h +++ b/src/ui/dialog/tile.h @@ -19,6 +19,7 @@ #include <gtkmm/notebook.h> #include <gtkmm/checkbutton.h> #include <gtkmm/radiobutton.h> +#include <gtkmm/table.h> #include "ui/widget/panel.h" #include "ui/widget/spinbutton.h" @@ -129,8 +130,10 @@ private: Gtk::RadioButton HorizRightRadioButton; double HorizAlign; + Inkscape::UI::Widget::UnitMenu PaddingUnitMenu; Inkscape::UI::Widget::ScalarUnit XPadding; Inkscape::UI::Widget::ScalarUnit YPadding; + Gtk::Table PaddingTable; // BBox or manual spacing Gtk::VBox SpacingVBox; |