liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-01-21 08:42:26 +01:00
parent 368325dca2 61e411b437
commit 6cdbba2a0f
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/crophandler.cc
View File

@@ -426,11 +426,11 @@ bool CropHandler::getWindow (int& cwx, int& cwy, int& cww, int& cwh, int& cskip)
cwh = cropH;
// hack: if called before first size allocation the size will be 0
if (cww < 10) {
if (cww == 0) {
cww = 10;
}
if (cwh < 32) {
if (cwh == 0) {
cwh = 32;
}

4
rtgui/preferences.cc
View File

@@ -789,8 +789,12 @@ Gtk::Widget* Preferences::getColorManagementPanel()
setExpandAlignProperties(iccdgrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
iccdgrid->set_column_spacing(4);
Gtk::Label* monProfileRestartNeeded = Gtk::manage ( new Gtk::Label (Glib::ustring (" (") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")") );
setExpandAlignProperties(monProfileRestartNeeded, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
iccdgrid->attach(*pdlabel, 0, 0, 1, 1);
iccdgrid->attach(*iccDir, 1, 0, 1, 1);
iccdgrid->attach (*monProfileRestartNeeded, 2, 0, 1, 1);
iccDir->signal_selection_changed().connect(sigc::mem_fun(this, &Preferences::iccDirChanged));