diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2017-07-09 22:28:38 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2017-07-09 22:28:38 +0000 |
| commit | 28d0874e77b657f504419ee5dca1bf1d5fa1675b (patch) | |
| tree | 26f73d70621d43a6021ec2804de6c693869bf1e3 /src/ui/widget/selected-style.cpp | |
| parent | Fix build for Gtk < 3.12 (diff) | |
| download | inkscape-28d0874e77b657f504419ee5dca1bf1d5fa1675b.tar.gz inkscape-28d0874e77b657f504419ee5dca1bf1d5fa1675b.zip | |
Update Gtk margin handling
Diffstat (limited to 'src/ui/widget/selected-style.cpp')
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 504e9a813..68acddfcc 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -148,13 +148,32 @@ SelectedStyle::SelectedStyle(bool /*layout*/) _fill_label.set_halign(Gtk::ALIGN_START); _fill_label.set_valign(Gtk::ALIGN_CENTER); - _fill_label.set_padding(0, 0); + _fill_label.set_margin_top(0); + _fill_label.set_margin_bottom(0); _stroke_label.set_halign(Gtk::ALIGN_START); _stroke_label.set_valign(Gtk::ALIGN_CENTER); - _stroke_label.set_padding(0, 0); + _stroke_label.set_margin_top(0); + _stroke_label.set_margin_bottom(0); _opacity_label.set_halign(Gtk::ALIGN_START); _opacity_label.set_valign(Gtk::ALIGN_CENTER); - _opacity_label.set_padding(0, 0); + _opacity_label.set_margin_top(0); + _opacity_label.set_margin_bottom(0); + +#if GTK_CHECK_VERSION(3,12,0) + _fill_label.set_margin_start(0); + _fill_label.set_margin_end(0); + _stroke_label.set_margin_start(0); + _stroke_label.set_margin_end(0); + _opacity_label.set_margin_start(0); + _opacity_label.set_margin_end(0); +#else + _fill_label.set_margin_left(0); + _fill_label.set_margin_right(0); + _stroke_label.set_margin_left(0); + _stroke_label.set_margin_right(0); + _opacity_label.set_margin_left(0); + _opacity_label.set_margin_right(0); +#endif _table.set_column_spacing(2); _table.set_row_spacing(0); |