🐛 Bug Fixes.

- Fixed exception when pressing the erosion button.
FarazzShaikh · Aug 12, 2020 · 9126b57 · 9126b57
1 parent 6796f40
commit 9126b57
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/src/Components/ui/MiscComponents/BasicButton.js b/src/Components/ui/MiscComponents/BasicButton.js
@@ -6,7 +6,10 @@ export default class BasicButton extends Component {
 
  render() {
  return (
- <div className={this.props.classOverride ? this.props.classOverride : 'ResolutionInputView-button'} onMouseDown={this.props.onMouseDown}>
+ <div 
+ className={this.props.classOverride ? this.props.classOverride : 'ResolutionInputView-button'} 
+ onMouseDown={this.props.onMouseDown}
+ >
  {this.props.buttonLabel}
  </div>
  );

diff --git a/src/Components/ui/ProjectSettings/ErodeButton/ErodeButtonView.js b/src/Components/ui/ProjectSettings/ErodeButton/ErodeButtonView.js
@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import BasicButton from '../../MiscComponents/BasicButton';
-import { erode } from '../../../3dView/main/Erosion/Erosion';
 
 
 export default class ErodeButtonView extends Component {
@@ -9,8 +8,8 @@ export default class ErodeButtonView extends Component {
  return (
  <div className={'ErodeButtonView-container'}>
  <BasicButton
- buttonLabel={'Erode'}
- onMouseDown={() => erode()}
+ buttonLabel={'Erosion Coming Soon!'}
+ onMouseDown={() => console.log('Erosion Coming Soon')}
  classOverride={'ErodeButtonView-button'}
  />
  </div>

diff --git a/src/Components/ui/ProjectSettings/ErodeButton/main.css b/src/Components/ui/ProjectSettings/ErodeButton/main.css
@@ -9,13 +9,13 @@
  margin-top: 8px;
  margin-bottom: 8px;
 
- background-color: #212121;
+ background-color: white;
  padding: 8px;
  text-align: center;
  font-family: sans-serif;
  font-size: 13px;
  font-weight: 300;
- cursor: pointer;
+ cursor: default;
  transition: all 300ms ease-in-out;
  color: black;
  -webkit-user-select: none; /* Safari */ 
@@ -24,7 +24,7 @@
  user-select: none; /* Standard */
 }
 
-.ErodeButtonView-button:hover {
+/* .ErodeButtonView-button:hover {
  background-color: #212121;
  color: black;
-}
+} */
diff --git a/src/Components/ui/ProjectSettings/IconContainer/IconContainerViewController.js b/src/Components/ui/ProjectSettings/IconContainer/IconContainerViewController.js
@@ -23,7 +23,7 @@ export default class IconContainerViewController extends Component {
  {
  icon: Icon_resolution,
  label: 'Resolution',
- value: `${numeral(this.props.resolutionValue).format('0,0')}`,
+ value: `${numeral(this.props.mapResValue).format('0,0')}px`,
  },
  {
  icon: Icon_renderTime,

diff --git a/src/Components/ui/ProjectSettings/ProjectInfoRootView.js b/src/Components/ui/ProjectSettings/ProjectInfoRootView.js
@@ -57,6 +57,7 @@ export default class ProjectInfoRootView extends Component {
  />
  <IconContainerViewController 
  resolutionValue={this.props.resolutionValue}
+ mapResValue={this.props.mapResValue}
 
  timeDisplace={this.props.timeDisplace}
  />

diff --git a/src/Redux/Defaults.js b/src/Redux/Defaults.js
@@ -17,7 +17,7 @@ const Defaults = {
  GEN_xOff: 0,
  GEN_yOff: 0,
 
- TIME_displace: 2000,
+ TIME_displace: 0,
 
  MAP_Resolution: 256,
 }