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

Correction to toolpanelcoord.cc thanks to Pandagrapher

Browse Source
This commit is contained in:
Desmis
2019-05-22 08:27:16 +02:00
parent 8bbf463c13
commit 925ce5a4c4
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/toolpanelcoord.cc
View File

@@ -1058,6 +1058,7 @@ void ToolPanelCoordinator::updateTPVScrollbar(bool hide)
void ToolPanelCoordinator::toolSelected(ToolMode tool) void ToolPanelCoordinator::toolSelected(ToolMode tool)
{ {
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
notebookconn.block(true); // "signal_switch_page" event is blocked to avoid unsubscribing Locallab (allows a correct behavior when switching to another tool using toolbar)
auto checkFavorite = [this](FoldableToolPanel* tool) { auto checkFavorite = [this](FoldableToolPanel* tool) {
for (auto fav : favorites) { for (auto fav : favorites) {
@@ -1070,18 +1071,23 @@ void ToolPanelCoordinator::toolSelected(ToolMode tool)
switch (tool) { switch (tool) {
case TMCropSelect: { case TMCropSelect: {
toolBar->blockEditDeactivation(false); // To allow deactivating Locallab when switching to another tool using toolbar
crop->setExpanded(true); crop->setExpanded(true);
toolPanelNotebook->set_current_page(toolPanelNotebook->page_num(checkFavorite(crop) ? *favoritePanelSW : *transformPanelSW)); toolPanelNotebook->set_current_page(toolPanelNotebook->page_num(checkFavorite(crop) ? *favoritePanelSW : *transformPanelSW));
prevPage = toolPanelNotebook->get_nth_page(toolPanelNotebook->get_current_page()); // Updating prevPage as "signal_switch_page" event
break; break;
} }
case TMSpotWB: { case TMSpotWB: {
toolBar->blockEditDeactivation(false); // To allow deactivating Locallab when switching to another tool using toolbar
whitebalance->setExpanded(true); whitebalance->setExpanded(true);
toolPanelNotebook->set_current_page(toolPanelNotebook->page_num(checkFavorite(whitebalance) ? *favoritePanelSW : *colorPanelSW)); toolPanelNotebook->set_current_page(toolPanelNotebook->page_num(checkFavorite(whitebalance) ? *favoritePanelSW : *colorPanelSW));
prevPage = toolPanelNotebook->get_nth_page(toolPanelNotebook->get_current_page()); // Updating prevPage as "signal_switch_page" event
break; break;
} }
case TMStraighten: { case TMStraighten: {
toolBar->blockEditDeactivation(false); // To allow deactivating Locallab when switching to another tool using toolbar
rotate->setExpanded(true); rotate->setExpanded(true);
bool isFavorite = checkFavorite(rotate); bool isFavorite = checkFavorite(rotate);
if (!isFavorite) { if (!isFavorite) {
@@ -1089,12 +1095,15 @@ void ToolPanelCoordinator::toolSelected(ToolMode tool)
lensgeom->setExpanded(true); lensgeom->setExpanded(true);
} }
toolPanelNotebook->set_current_page(toolPanelNotebook->page_num(isFavorite ? *favoritePanelSW : *transformPanelSW)); toolPanelNotebook->set_current_page(toolPanelNotebook->page_num(isFavorite ? *favoritePanelSW : *transformPanelSW));
prevPage = toolPanelNotebook->get_nth_page(toolPanelNotebook->get_current_page()); // Updating prevPage as "signal_switch_page" event
break; break;
} }
default: default:
break; break;
} }
notebookconn.block(false);
} }
void ToolPanelCoordinator::editModeSwitchedOff() void ToolPanelCoordinator::editModeSwitchedOff()