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-10-22 18:52:22 +02:00
parent 769804c7fa 959849f098
commit 9dd3d002a4
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtengine/capturesharpening.cc
View File

@@ -810,6 +810,7 @@ BENCHFUN
if (plistener) { if (plistener) {
plistener->setProgress(1.0); plistener->setProgress(1.0);
} }
rgbSourceModified = false;
} }
} /* namespace */ } /* namespace */

2
rtgui/toolpanelcoord.cc
View File

@@ -182,7 +182,6 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favorit
rawPanelSW = Gtk::manage (new MyScrolledWindow ()); rawPanelSW = Gtk::manage (new MyScrolledWindow ());
advancedPanelSW = Gtk::manage (new MyScrolledWindow ()); advancedPanelSW = Gtk::manage (new MyScrolledWindow ());
locallabPanelSW = Gtk::manage(new MyScrolledWindow()); locallabPanelSW = Gtk::manage(new MyScrolledWindow());
updateVScrollbars (options.hideTPVScrollbar);
// load panel endings // load panel endings
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
@@ -198,6 +197,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favorit
favoritePanel->pack_start(*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); favoritePanel->pack_start(*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
favoritePanel->pack_start(*vbPanelEnd[0], Gtk::PACK_SHRINK, 4); favoritePanel->pack_start(*vbPanelEnd[0], Gtk::PACK_SHRINK, 4);
} }
updateVScrollbars(options.hideTPVScrollbar);
exposurePanelSW->add (*exposurePanel); exposurePanelSW->add (*exposurePanel);
exposurePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0); exposurePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);