diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 5cec36f1f..114396cc3 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -423,11 +423,13 @@ Gtk::Widget* Preferences::getProcParamsPanel () Gtk::VBox* vbpp = Gtk::manage (new Gtk::VBox ()); Gtk::Label* drlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_FORRAW") + ":", Gtk::ALIGN_START)); rprofiles = Gtk::manage (new ProfileStoreComboBox ()); + setExpandAlignProperties(rprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); rprofiles->set_size_request(50, -1); rpconn = rprofiles->signal_changed().connect( sigc::mem_fun(*this, &Preferences::forRAWComboChanged) ); Gtk::Label* drimg = Gtk::manage (new Gtk::Label (M("PREFERENCES_FORIMAGE") + ":", Gtk::ALIGN_START)); iprofiles = Gtk::manage (new ProfileStoreComboBox ()); iprofiles->set_size_request(50, -1); + setExpandAlignProperties(iprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL); ipconn = iprofiles->signal_changed().connect( sigc::mem_fun(*this, &Preferences::forImageComboChanged) ); Gtk::Table* defpt = Gtk::manage (new Gtk::Table (2, 2)); defpt->attach (*drlab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2); diff --git a/rtgui/profilestore.cc b/rtgui/profilestore.cc index 95bc4ca68..68321e985 100644 --- a/rtgui/profilestore.cc +++ b/rtgui/profilestore.cc @@ -517,9 +517,6 @@ ProfileStoreComboBox::ProfileStoreComboBox () { updateProfileList(); setPreferredWidth(50, 120); - Gtk::CellRendererText* cellRenderer = dynamic_cast(get_first_cell()); - cellRenderer->property_ellipsize() = Pango::ELLIPSIZE_MIDDLE; - cellRenderer->property_ellipsize_set() = true; } Glib::ustring ProfileStoreComboBox::getCurrentLabel() @@ -610,7 +607,6 @@ void ProfileStoreComboBox::updateProfileList () // Assign the model to the Combobox set_model(refTreeModel); - // this will lock the profilestore's entry list too const std::vector *entryList = profileStore.getFileList(); @@ -626,6 +622,10 @@ void ProfileStoreComboBox::updateProfileList () profileStore.releaseFileList(); pack_start(methodColumns.label, false); + + Gtk::CellRendererText* cellRenderer = dynamic_cast(get_first_cell()); + cellRenderer->property_ellipsize() = Pango::ELLIPSIZE_MIDDLE; + cellRenderer->property_ellipsize_set() = true; } Gtk::TreeIter ProfileStoreComboBox::findRowFromEntry_ (Gtk::TreeModel::Children childs, const ProfileStoreEntry *pse)