Merge master into gtk3

This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
259 changed files with 5061 additions and 3654 deletions

View File

@@ -254,7 +254,7 @@ void HistogramPanel::resized (Gtk::Allocation& req)
histogramArea->updateBackBuffer ();
histogramArea->queue_draw ();
if (histogramRGBArea->getFreeze() == true) {
if (histogramRGBArea->getFreeze()) {
histogramRGBArea->updateFreeze(false);
// set histogramRGBArea invalid;
histogramRGBArea->updateBackBuffer(-1, -1, -1);
@@ -344,9 +344,9 @@ void HistogramPanel::setHistRGBInvalid ()
// "Freeze" is not a button, but a RMB-click, so this is not in the RGBV-Toggle method
void HistogramPanel::toggleFreeze ()
{
if (histogramRGBArea->getFreeze() == true) {
if (histogramRGBArea->getFreeze()) {
histogramRGBArea->updateFreeze(false);
} else if (histogramRGBArea->getShow() == true) {
} else if (histogramRGBArea->getShow()) {
histogramRGBArea->updateFreeze(true);
}