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
2019-08-20 08:56:33 +02:00
parent 526ec318ce b6d333ee72
commit 6c1d676d3c
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/editorpanel.cc
View File

@@ -1090,8 +1090,8 @@ void EditorPanel::close ()
if (iareapanel) { if (iareapanel) {
iareapanel->imageArea->setPreviewHandler (nullptr); iareapanel->imageArea->setPreviewHandler (nullptr);
iareapanel->imageArea->setImProcCoordinator (nullptr); iareapanel->imageArea->setImProcCoordinator (nullptr);
tpc->editModeSwitchedOff();
} }
tpc->editModeSwitchedOff();
rtengine::StagedImageProcessor::destroy (ipc); rtengine::StagedImageProcessor::destroy (ipc);
ipc = nullptr; ipc = nullptr;

13
rtgui/resize.cc
View File

@@ -91,14 +91,13 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
sbox->pack_start (*hbox); sbox->pack_start (*hbox);
sizeBox->pack_start (*sbox, Gtk::PACK_SHRINK, 0); sizeBox->pack_start (*sbox, Gtk::PACK_SHRINK, 0);
allowUpscaling = Gtk::manage(new Gtk::CheckButton(M("TP_RESIZE_ALLOW_UPSCALING")));
sizeBox->pack_start(*allowUpscaling);
allowUpscaling->signal_toggled().connect(sigc::mem_fun(*this, &Resize::allowUpscalingChanged));
sizeBox->show_all (); sizeBox->show_all ();
sizeBox->reference (); sizeBox->reference ();
allowUpscaling = Gtk::manage(new Gtk::CheckButton(M("TP_RESIZE_ALLOW_UPSCALING")));
pack_start(*allowUpscaling);
allowUpscaling->signal_toggled().connect(sigc::mem_fun(*this, &Resize::allowUpscalingChanged));
w->set_digits (0); w->set_digits (0);
w->set_increments (1, 100); w->set_increments (1, 100);
w->set_value (800); w->set_value (800);
@@ -572,11 +571,13 @@ void Resize::updateGUI ()
case (0): case (0):
// Scale mode // Scale mode
pack_start (*scale, Gtk::PACK_SHRINK, 4); pack_start (*scale, Gtk::PACK_SHRINK, 4);
reorder_child(*allowUpscaling, 4);
break; break;
case (1): case (1):
// Width mode // Width mode
pack_start (*sizeBox, Gtk::PACK_SHRINK, 4); pack_start (*sizeBox, Gtk::PACK_SHRINK, 4);
reorder_child(*allowUpscaling, 4);
w->set_sensitive (true); w->set_sensitive (true);
h->set_sensitive (false); h->set_sensitive (false);
break; break;
@@ -584,6 +585,7 @@ void Resize::updateGUI ()
case (2): case (2):
// Height mode // Height mode
pack_start (*sizeBox, Gtk::PACK_SHRINK, 4); pack_start (*sizeBox, Gtk::PACK_SHRINK, 4);
reorder_child(*allowUpscaling, 4);
w->set_sensitive (false); w->set_sensitive (false);
h->set_sensitive (true); h->set_sensitive (true);
break; break;
@@ -591,6 +593,7 @@ void Resize::updateGUI ()
case (3): case (3):
// Bounding box mode // Bounding box mode
pack_start (*sizeBox, Gtk::PACK_SHRINK, 4); pack_start (*sizeBox, Gtk::PACK_SHRINK, 4);
reorder_child(*allowUpscaling, 4);
w->set_sensitive (true); w->set_sensitive (true);
h->set_sensitive (true); h->set_sensitive (true);
break; break;