diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
| commit | 241554b7ad311b5868ba284c7a4e6a410432b9bd (patch) | |
| tree | 8bf6fed572d27e9b97ca60b90ae1684ba4856eeb /src/widgets/sp-attribute-widget.cpp | |
| parent | Use .xml when exporting shortcuts by default (diff) | |
| parent | Shortcuts: Fix for 7d248fbba5b0c24d9a24cda8c3f2e79f96395553 (is_user_set was ... (diff) | |
| download | inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.tar.gz inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.zip | |
Merge branch 'master' into shortcuts
Diffstat (limited to 'src/widgets/sp-attribute-widget.cpp')
| -rw-r--r-- | src/widgets/sp-attribute-widget.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp index cbff62b23..89ce191ee 100644 --- a/src/widgets/sp-attribute-widget.cpp +++ b/src/widgets/sp-attribute-widget.cpp @@ -157,10 +157,16 @@ void SPAttributeTable::set_object(SPObject *object, for (guint i = 0; i < (attributes.size()); i++) { Gtk::Label *ll = new Gtk::Label (_(labels[i].c_str())); ll->show(); - ll->set_alignment (1.0, 0.5); + ll->set_halign(Gtk::ALIGN_END); + ll->set_valign(Gtk::ALIGN_CENTER); ll->set_vexpand(); +#if WITH_GTKMM_3_12 + ll->set_margin_start(XPAD); + ll->set_margin_end(XPAD); +#else ll->set_margin_left(XPAD); ll->set_margin_right(XPAD); +#endif ll->set_margin_top(XPAD); ll->set_margin_bottom(XPAD); table->attach(*ll, 0, i, 1, 1); @@ -171,8 +177,13 @@ void SPAttributeTable::set_object(SPObject *object, ee->set_text (val ? val : (const gchar *) ""); ee->set_hexpand(); ee->set_vexpand(); +#if WITH_GTKMM_3_12 + ee->set_margin_start(XPAD); + ee->set_margin_end(XPAD); +#else ee->set_margin_left(XPAD); ee->set_margin_right(XPAD); +#endif ee->set_margin_top(XPAD); ee->set_margin_bottom(XPAD); table->attach(*ee, 1, i, 1, 1); |