From 38f9928756f7783124660d082f4da4dd29b8ea48 Mon Sep 17 00:00:00 2001 From: Alexander Shaduri Date: Mon, 24 Jan 2022 13:00:21 +0400 Subject: [PATCH] Ported away from deprecated Gtk::Label methods. --- src/applib/gui_utils.cpp | 4 ++-- src/gsc_info_window.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/applib/gui_utils.cpp b/src/applib/gui_utils.cpp index cdedefe..ab26550 100644 --- a/src/applib/gui_utils.cpp +++ b/src/applib/gui_utils.cpp @@ -112,7 +112,7 @@ bool gui_show_text_entry_dialog(const std::string& title, const std::string& mes + (sec_message.empty() ? "\n" : "") + ""); main_label.set_line_wrap(true); main_label.set_selectable(true); - main_label.set_alignment(Gtk::ALIGN_START); + main_label.set_halign(Gtk::ALIGN_START); Gtk::Label sec_label; if (sec_msg_markup) { @@ -122,7 +122,7 @@ bool gui_show_text_entry_dialog(const std::string& title, const std::string& mes } sec_label.set_line_wrap(true); sec_label.set_selectable(true); - sec_label.set_alignment(Gtk::ALIGN_START); + sec_label.set_halign(Gtk::ALIGN_START); Gtk::Entry input_entry; input_entry.set_activates_default(true); diff --git a/src/gsc_info_window.cpp b/src/gsc_info_window.cpp index dca9ddd..1292132 100644 --- a/src/gsc_info_window.cpp +++ b/src/gsc_info_window.cpp @@ -86,7 +86,7 @@ namespace { Gtk::Label* label = Gtk::manage(new Gtk::Label()); label->set_markup(label_text); label->set_padding(6, 0); - label->set_alignment(Gtk::ALIGN_START); + label->set_halign(Gtk::ALIGN_START); // label->set_ellipsize(Pango::ELLIPSIZE_END); label->set_selectable(true); label->set_can_focus(false); @@ -917,7 +917,7 @@ void GscInfoWindow::fill_ui_general(const std::vector& props Gtk::Label* name = Gtk::manage(new Gtk::Label()); // name->set_ellipsize(Pango::ELLIPSIZE_END); - name->set_alignment(Gtk::ALIGN_END); // right-align + name->set_halign(Gtk::ALIGN_END); // right-align name->set_selectable(true); name->set_can_focus(false); name->set_markup("" + Glib::Markup::escape_text(p.displayable_name) + ""); @@ -927,7 +927,7 @@ void GscInfoWindow::fill_ui_general(const std::vector& props // then it stops being right-aligned. Gtk::Label* value = Gtk::manage(new Gtk::Label()); // value->set_ellipsize(Pango::ELLIPSIZE_END); - value->set_alignment(Gtk::ALIGN_START); // left-align + value->set_halign(Gtk::ALIGN_START); // left-align value->set_selectable(true); value->set_can_focus(false); value->set_markup(Glib::Markup::escape_text(p.format_value()));