Disable brush in merge mode

CHANGELOG.unreleased.md

@@ -25,6 +25,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - In the Edit/Import Dataset form, the "Sharing" tab was renamed to "Sharing & Permissions". Also, existing permission-related settings were moved to that tab.  [#4683](https://github.com/scalableminds/webknossos/pull/4763)
 - Improved rotation of camera in 3D viewport. [#4768](https://github.com/scalableminds/webknossos/pull/4768)
 - Improved handling and communication of failures during download of data from datasets. [#4765](https://github.com/scalableminds/webknossos/pull/4765)
+- The annotation tools in hybrid tracings are disabled while in merger mode. [#4757](https://github.com/scalableminds/webknossos/pull/4770)
 
 ### Fixed
 - Speed up NML import in existing tracings for NMLs with many trees (20,000+). [#4742](https://github.com/scalableminds/webknossos/pull/4742)

frontend/javascripts/oxalis/view/action-bar/volume_actions_view.js

@@ -1,5 +1,5 @@
 // @flow
-import { Button, Radio } from "antd";
+import { Button, Radio, Tooltip } from "antd";
 import { connect } from "react-redux";
 import React, { PureComponent } from "react";
 
@@ -17,9 +17,16 @@ const ButtonGroup = Button.Group;
 
 type Props = {|
   activeTool: VolumeTool,
+  isInMergerMode: boolean,
 |};
 
 class VolumeActionsView extends PureComponent<Props> {
+  componentDidUpdate = (prevProps: Props) => {
+    if (!prevProps.isInMergerMode && this.props.isInMergerMode) {
+      Store.dispatch(setToolAction(VolumeToolEnum.MOVE));
+    }
+  };
+
   handleSetTool = (event: { target: { value: VolumeTool } }) => {
     Store.dispatch(setToolAction(event.target.value));
   };
@@ -41,8 +48,20 @@ class VolumeActionsView extends PureComponent<Props> {
           style={{ marginRight: 10 }}
         >
           <RadioButton value={VolumeToolEnum.MOVE}>Move</RadioButton>
-          <RadioButton value={VolumeToolEnum.TRACE}>Trace</RadioButton>
-          <RadioButton value={VolumeToolEnum.BRUSH}>Brush</RadioButton>
+          <Tooltip
+            title={
+              this.props.isInMergerMode
+                ? "Volume annotation is disabled while the merger mode is active."
+                : ""
+            }
+          >
+            <RadioButton value={VolumeToolEnum.TRACE} disabled={this.props.isInMergerMode}>
+              Trace
+            </RadioButton>
+            <RadioButton value={VolumeToolEnum.BRUSH} disabled={this.props.isInMergerMode}>
+              Brush
+            </RadioButton>
+          </Tooltip>
         </RadioGroup>
         <ButtonGroup>
           <ButtonComponent onClick={this.handleCreateCell}>
@@ -58,6 +77,7 @@ class VolumeActionsView extends PureComponent<Props> {
 function mapStateToProps(state: OxalisState): Props {
   return {
     activeTool: enforceVolumeTracing(state.tracing).activeTool,
+    isInMergerMode: state.temporaryConfiguration.isMergerModeEnabled,
   };
 }
 

frontend/stylesheets/trace_view/_tracing_view.less

@@ -194,6 +194,14 @@
     &:hover {
       border-color: @hover-border;
     }
+
+    &.ant-btn-disabled,
+    &.ant-input-disabled,
+    &.ant-radio-button-wrapper-disabled,
+    &.ant-select-selection-disabled {
+      color: fade(@dark-fg, 50%);
+      border-color: @dark-border;
+    }
   }
 
   .ant-select-arrow {