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

Merge master into gtk3

Browse Source
This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/previewmodepanel.cc
View File

@@ -88,9 +88,9 @@ PreviewModePanel::PreviewModePanel (ImageArea* ia) : imageArea(ia)
previewL->set_active (false);
previewFocusMask->set_active (false);
backColor0->set_active (options.bgcolor == 0 ? true : false);
backColor1->set_active (options.bgcolor == 1 ? true : false);
backColor2->set_active (options.bgcolor == 2 ? true : false);
backColor0->set_active (options.bgcolor == 0);
backColor1->set_active (options.bgcolor == 1);
backColor2->set_active (options.bgcolor == 2);
vbbackColor = Gtk::manage (new Gtk::VBox ());
vbbackColor->pack_start (*backColor0, Gtk::PACK_SHRINK, 0);
@@ -219,7 +219,7 @@ void PreviewModePanel::buttonToggled (Gtk::ToggleButton* tbpreview)
// this will redraw the linked Before image area
// which is set when before/after view is enabled
if (imageArea->iLinkedImageArea != NULL) {
if (imageArea->iLinkedImageArea != nullptr) {
imageArea->iLinkedImageArea->queue_draw ();
}
}
@@ -303,7 +303,7 @@ void PreviewModePanel::buttonToggled_backColor (Gtk::ToggleButton* tbbackColor)
// this will redraw the linked Before image area
// which is set when before/after view is enabled
if (imageArea->iLinkedImageArea != NULL) {
if (imageArea->iLinkedImageArea != nullptr) {
imageArea->iLinkedImageArea->queue_draw ();
}
}