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-22 13:44:29 +02:00
parent 9820b46ad3 e93ce86067
commit 634c951e39
4 changed files with 38 additions and 20 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) {
iareapanel->imageArea->setPreviewHandler (nullptr);
iareapanel->imageArea->setImProcCoordinator (nullptr);
tpc->editModeSwitchedOff();
}
tpc->editModeSwitchedOff();
rtengine::StagedImageProcessor::destroy (ipc);
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);
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->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_increments (1, 100);
w->set_value (800);
@@ -572,11 +571,13 @@ void Resize::updateGUI ()
case (0):
// Scale mode
pack_start (*scale, Gtk::PACK_SHRINK, 4);
reorder_child(*allowUpscaling, 4);
break;
case (1):
// Width mode
pack_start (*sizeBox, Gtk::PACK_SHRINK, 4);
reorder_child(*allowUpscaling, 4);
w->set_sensitive (true);
h->set_sensitive (false);
break;
@@ -584,6 +585,7 @@ void Resize::updateGUI ()
case (2):
// Height mode
pack_start (*sizeBox, Gtk::PACK_SHRINK, 4);
reorder_child(*allowUpscaling, 4);
w->set_sensitive (false);
h->set_sensitive (true);
break;
@@ -591,6 +593,7 @@ void Resize::updateGUI ()
case (3):
// Bounding box mode
pack_start (*sizeBox, Gtk::PACK_SHRINK, 4);
reorder_child(*allowUpscaling, 4);
w->set_sensitive (true);
h->set_sensitive (true);
break;

18
rtgui/thresholdselector.cc
View File

@@ -629,13 +629,8 @@ void ThresholdSelector::findBoundaries(double &min, double &max)
switch (movedCursor) {
case (TS_BOTTOMLEFT):
if (separatedSliders) {
if (movedCursor == TS_BOTTOMLEFT) {
min = minValBottom;
max = maxValBottom;
} else if (movedCursor == TS_TOPLEFT) {
min = minValTop;
max = maxValTop;
}
min = minValBottom;
max = maxValBottom;
} else if (initalEq1) {
min = secondaryMovedCursor == TS_UNDEFINED ? positions[TS_TOPLEFT] : minValTop + (positions[TS_BOTTOMLEFT] - positions[TS_TOPLEFT]);
max = positions[TS_BOTTOMRIGHT];
@@ -648,13 +643,8 @@ void ThresholdSelector::findBoundaries(double &min, double &max)
case (TS_TOPLEFT):
if (separatedSliders) {
if (movedCursor == TS_BOTTOMLEFT) {
min = minValBottom;
max = maxValBottom;
} else if (movedCursor == TS_TOPLEFT) {
min = minValTop;
max = maxValTop;
}
min = minValTop;
max = maxValTop;
} else if (initalEq1) {
min = minValTop;
max = secondaryMovedCursor == TS_UNDEFINED ? positions[TS_BOTTOMLEFT] : positions[TS_BOTTOMRIGHT] - (positions[TS_BOTTOMLEFT] - positions[TS_TOPLEFT]);