From 3bdf38437c7f21223b18939c12701880c4ca6f20 Mon Sep 17 00:00:00 2001 From: Hombre Date: Tue, 27 Sep 2016 02:08:23 +0200 Subject: [PATCH] Fix issue #3186: "Combobox text overflow Gtk3" + fix a bug that prevent RT from building with gcc6.2 --- rtgui/dirbrowser.cc | 2 +- rtgui/editorpanel.cc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc index 1d4038e91..fb9e43272 100644 --- a/rtgui/dirbrowser.cc +++ b/rtgui/dirbrowser.cc @@ -59,7 +59,7 @@ std::vector listSubDirs (const Glib::RefPtr& dir, bool } catch (const Glib::Exception& exception) { if (options.rtSettings.verbose) { - std::cerr << "Failed to list subdirectories of \"" << dir << "\": " << exception.what () << std::endl; + std::cerr << "Failed to list subdirectories of \"" << dir->get_parse_name() << "\": " << exception.what () << std::endl; } } diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index bbbbbcbf4..eed4f404c 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -50,6 +50,8 @@ private: profileBox.set_size_request (100, -1); profileBox.setPreferredWidth (90, 150); setExpandAlignProperties (&profileBox, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER); + Gtk::CellRendererText* cellRenderer = dynamic_cast(profileBox.get_first_cell()); + cellRenderer->property_ellipsize() = Pango::ELLIPSIZE_MIDDLE; profileBox.append (M ("PREFERENCES_PROFILE_NONE")); #ifdef WIN32