From 501e9819954d2fb6dfdb831a71b8752b5afd1a2a Mon Sep 17 00:00:00 2001
From: Alexander Valavanis <valavanisalex@gmail.com>
Date: Sat, 8 Jul 2017 12:50:17 +0200
Subject: Fix Gtk alignment API

---
 src/ui/widget/color-wheel-selector.cpp |  3 ++-
 src/ui/widget/registered-widget.cpp    | 12 ++++++++++--
 src/ui/widget/selected-style.cpp       |  9 ++++++---
 src/ui/widget/style-swatch.cpp         |  6 ++++--
 src/ui/widget/tolerance-slider.cpp     |  9 ++++++---
 5 files changed, 28 insertions(+), 11 deletions(-)

(limited to 'src/ui/widget')

diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index 4f011c6c3..6bbb8e21d 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -62,7 +62,8 @@ void ColorWheelSelector::_initUI()
 
     /* Label */
     Gtk::Label *label = Gtk::manage(new Gtk::Label(_("_A:"), true));
-    label->set_alignment(1.0, 0.5);
+    label->set_halign(Gtk::ALIGN_END);
+    label->set_valign(Gtk::ALIGN_CENTER);
     label->show();
 
   #if GTK_CHECK_VERSION(3, 12, 0)
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index be677a434..0af5bdba0 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -55,7 +55,11 @@ RegisteredCheckButton::RegisteredCheckButton (const Glib::ustring& label, const
     Gtk::Label *l = new Gtk::Label (label);
     l->set_use_underline (true);
     add (*manage (l));
-    set_alignment (right? 1.0 : 0.0, 0.5);
+
+    if(right) set_halign(Gtk::ALIGN_END);
+    else      set_halign(Gtk::ALIGN_START);
+
+    set_valign(Gtk::ALIGN_CENTER);
     _toggled_connection = signal_toggled().connect (sigc::mem_fun (*this, &RegisteredCheckButton::on_toggled));
 }
 
@@ -107,7 +111,11 @@ RegisteredToggleButton::RegisteredToggleButton (const Glib::ustring& /*label*/,
     init_parent(key, wr, repr_in, doc_in);
     setProgrammatically = false;
     set_tooltip_text (tip);
-    set_alignment (right? 1.0 : 0.0, 0.5);
+
+    if(right) set_halign(Gtk::ALIGN_END);
+    else      set_halign(Gtk::ALIGN_START);
+
+    set_valign(Gtk::ALIGN_CENTER);
     _toggled_connection = signal_toggled().connect (sigc::mem_fun (*this, &RegisteredToggleButton::on_toggled));
 }
 
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 65d68195c..8ea1e530f 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -146,11 +146,14 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
     _drop[0] = _drop[1] = 0;
     _dropEnabled[0] = _dropEnabled[1] = false;
 
-    _fill_label.set_alignment(0.0, 0.5);
+    _fill_label.set_halign(Gtk::ALIGN_START);
+    _fill_label.set_valign(Gtk::ALIGN_CENTER);
     _fill_label.set_padding(0, 0);
-    _stroke_label.set_alignment(0.0, 0.5);
+    _stroke_label.set_halign(Gtk::ALIGN_START);
+    _stroke_label.set_valign(Gtk::ALIGN_CENTER);
     _stroke_label.set_padding(0, 0);
-    _opacity_label.set_alignment(0.0, 0.5);
+    _opacity_label.set_halign(Gtk::ALIGN_START);
+    _opacity_label.set_valign(Gtk::ALIGN_CENTER);
     _opacity_label.set_padding(0, 0);
 
     _table.set_column_spacing(2);
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index f8eac1c78..4beb0b323 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -116,13 +116,15 @@ StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip)
     _label[SS_STROKE].set_markup(_("Stroke:"));
 
     for (int i = SS_FILL; i <= SS_STROKE; i++) {
-        _label[i].set_alignment(0.0, 0.5);
+        _label[i].set_halign(Gtk::ALIGN_START);
+        _label[i].set_valign(Gtk::ALIGN_CENTER);
         _label[i].set_padding(0, 0);
 
         _color_preview[i] = new Inkscape::UI::Widget::ColorPreview (0);
     }
 
-    _opacity_value.set_alignment(0.0, 0.5);
+    _opacity_value.set_halign(Gtk::ALIGN_START);
+    _opacity_value.set_valign(Gtk::ALIGN_CENTER);
     _opacity_value.set_padding(0, 0);
 
     _table->set_column_spacing(2);
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index dea14585d..47e646c34 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -72,7 +72,8 @@ void ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& la
     
     Gtk::Label *theLabel1 = Gtk::manage(new Gtk::Label(label1));
     theLabel1->set_use_underline();
-    theLabel1->set_alignment(0, 0.5);
+    theLabel1->set_halign(Gtk::ALIGN_START);
+    theLabel1->set_valign(Gtk::ALIGN_CENTER);
     // align the label with the checkbox text above by indenting 22 px.
     _hbox->pack_start(*theLabel1, Gtk::PACK_EXPAND_WIDGET, 22);
 
@@ -100,9 +101,11 @@ void ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& la
     _button1->set_tooltip_text (tip2);
     _button2->set_tooltip_text (tip3);    
     _button1->add (*theLabel3);
-    _button1->set_alignment (0.0, 0.5);    
+    _button1->set_halign(Gtk::ALIGN_START);
+    _button1->set_valign(Gtk::ALIGN_CENTER);
     _button2->add (*theLabel2);
-    _button2->set_alignment (0.0, 0.5);
+    _button2->set_halign(Gtk::ALIGN_START);
+    _button2->set_valign(Gtk::ALIGN_CENTER);
     
     _vbox->add (*_button1);
     _vbox->add (*_button2);    
-- 
cgit v1.2.3