From 46653386b9428685747db60c2f7e0254bcdcf57e Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Wed, 20 Oct 2021 15:22:19 +0300
Subject: [PATCH] Replacing icon for Remove from Hotbar action (#4086)

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../components/+catalog/catalog-entity-drawer-menu.tsx      | 4 ++--
 src/renderer/components/+catalog/catalog.tsx                | 2 +-
 .../components/+catalog/hotbar-toggle-menu-item.tsx         | 2 +-
 src/renderer/components/icon/push_off.svg                   | 1 +
 src/renderer/components/icon/unpin.svg                      | 6 ------
 5 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 src/renderer/components/icon/push_off.svg
 delete mode 100644 src/renderer/components/icon/unpin.svg

diff --git a/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx b/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
index 2d180bf9db..f356f31a8e 100644
--- a/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
+++ b/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
@@ -98,8 +98,8 @@ export class CatalogEntityDrawerMenu<T extends CatalogEntity> extends React.Comp
       <HotbarToggleMenuItem
         key="hotbar-toggle"
         entity={entity}
-        addContent={<Icon material="push_pin" small tooltip={"Add to Hotbar"}/>}
-        removeContent={<Icon svg="unpin" small tooltip={"Remove from Hotbar"}/>}
+        addContent={<Icon material="push_pin" small tooltip="Add to Hotbar"/>}
+        removeContent={<Icon svg="push_off" small tooltip="Remove from Hotbar"/>}
       />
     );
 
diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx
index 594bb610e3..06fdb5b21b 100644
--- a/src/renderer/components/+catalog/catalog.tsx
+++ b/src/renderer/components/+catalog/catalog.tsx
@@ -220,7 +220,7 @@ export class Catalog extends React.Component<Props> {
           small
           className={styles.pinIcon}
           material={!isItemInHotbar && "push_pin"}
-          svg={isItemInHotbar && "unpin"}
+          svg={isItemInHotbar && "push_off"}
           tooltip={isItemInHotbar ? "Remove from Hotbar" : "Add to Hotbar"}
           onClick={prevDefault(() => isItemInHotbar ? this.removeFromHotbar(item) : this.addToHotbar(item))}
         />
diff --git a/src/renderer/components/+catalog/hotbar-toggle-menu-item.tsx b/src/renderer/components/+catalog/hotbar-toggle-menu-item.tsx
index 7d679e4d81..00f6f3600f 100644
--- a/src/renderer/components/+catalog/hotbar-toggle-menu-item.tsx
+++ b/src/renderer/components/+catalog/hotbar-toggle-menu-item.tsx
@@ -26,7 +26,7 @@ import { MenuItem } from "../menu";
 import type { CatalogEntity } from "../../api/catalog-entity";
 
 export function HotbarToggleMenuItem(props: { entity: CatalogEntity, addContent: ReactNode, removeContent: ReactNode }) {
-  const store = HotbarStore.getInstance(false);
+  const store = HotbarStore.getInstance();
   const add = () => store.addToHotbar(props.entity);
   const remove = () => store.removeFromHotbar(props.entity.getId());
   const [itemInHotbar, setItemInHotbar] = useState(store.isAddedToActive(props.entity));
diff --git a/src/renderer/components/icon/push_off.svg b/src/renderer/components/icon/push_off.svg
new file mode 100644
index 0000000000..07221c1cc2
--- /dev/null
+++ b/src/renderer/components/icon/push_off.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M2,5.27L3.28,4L20,20.72L18.73,22L12.8,16.07V22H11.2V16H6V14L8,12V11.27L2,5.27M16,12L18,14V16H17.82L8,6.18V4H7V2H17V4H16V12Z" /></svg>
\ No newline at end of file
diff --git a/src/renderer/components/icon/unpin.svg b/src/renderer/components/icon/unpin.svg
deleted file mode 100644
index f685eb5e92..0000000000
--- a/src/renderer/components/icon/unpin.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path d="M12.6,12.1V2H7C6.5,2,6,2.5,6,3s0.5,1,1,1h1v5c0,1.7-1.3,3-3,3v2h6v7l1,1l1-1v-7h6v-1.9H12.6z"/>
-<polygon points="23.6,3.7 21.9,2 19.4,4.5 16.9,2 15.2,3.7 17.7,6.2 15.2,8.7 16.9,10.4 19.4,7.9 21.9,10.4 23.6,8.7 21.1,6.2 "/>
-</svg>