From 89a5bfba20625e69313abf14e6ed4f95e0a674bd Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Thu, 9 Aug 2018 23:49:10 +0100
Subject: [PATCH 1/2] Make the hide button setting functional

---
 .../styles/partials/bdsettings/button.scss    | 15 ++++++++++-
 .../src/styles/partials/discordoverrides.scss | 26 ++++++++++---------
 client/src/ui/bdui.js                         |  9 ++++++-
 .../src/ui/components/BdSettingsWrapper.vue   | 19 +++++++++++---
 4 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/client/src/styles/partials/bdsettings/button.scss b/client/src/styles/partials/bdsettings/button.scss
index 9ab8ae99..e2fc7fb3 100644
--- a/client/src/styles/partials/bdsettings/button.scss
+++ b/client/src/styles/partials/bdsettings/button.scss
@@ -43,9 +43,22 @@
         }
     }
 
+    &.bd-hide-button {
+        transition: opacity 0.4s ease-out;
+        opacity: 0;
+
+        &.bd-active {
+            transition-timing-function: ease-in;
+        }
+    }
+
     &.bd-active {
-        background: transparent;
         opacity: 1;
+    }
+
+    &.bd-active,
+    &.bd-hide-button {
+        background: transparent;
         box-shadow: none;
 
         .bd-settings-button-btn {
diff --git a/client/src/styles/partials/discordoverrides.scss b/client/src/styles/partials/discordoverrides.scss
index 6d051e20..42d668a9 100644
--- a/client/src/styles/partials/discordoverrides.scss
+++ b/client/src/styles/partials/discordoverrides.scss
@@ -1,20 +1,22 @@
-[class*="guildsWrapper-"] {
-    padding-top: 49px !important;
+body:not(.bd-hide-button) {
+    [class*="guildsWrapper-"] {
+        padding-top: 49px !important;
 
-    .platform-osx & {
-        margin-top: 26px;
+        .platform-osx & {
+            margin-top: 26px;
+        }
     }
-}
 
-[class*="guildsWrapper-"] + [class*="flex"] {
-    border-radius: 0 0 0 5px;
-}
+    [class*="guildsWrapper-"] + [class*="flex"] {
+        border-radius: 0 0 0 5px;
+    }
 
-[class*="unreadMentionsIndicatorTop-"] {
-    top: 49px;
+    [class*="unreadMentionsIndicatorTop-"] {
+        top: 49px;
 
-    .platform-osx & {
-        top: 50px;
+        .platform-osx & {
+            top: 50px;
+        }
     }
 }
 
diff --git a/client/src/ui/bdui.js b/client/src/ui/bdui.js
index 4cf25833..4d4e5261 100644
--- a/client/src/ui/bdui.js
+++ b/client/src/ui/bdui.js
@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Events, DiscordApi } from 'modules';
+import { Events, DiscordApi, Settings } from 'modules';
 import { remote } from 'electron';
 import DOM from './dom';
 import Vue from './vue';
@@ -17,6 +17,13 @@ import { BdSettingsWrapper, BdModals, BdToasts } from './components';
 export default class {
 
     static initUiEvents() {
+        const hideButtonSetting = Settings.getSetting('ui', 'default', 'hide-button');
+        hideButtonSetting.on('setting-updated', event => {
+            if (event.value) document.body.classList.add('bd-hide-button');
+            else document.body.classList.remove('bd-hide-button');
+        });
+        if (hideButtonSetting.value) document.body.classList.add('bd-hide-button');
+
         this.pathCache = {
             isDm: null,
             server: DiscordApi.currentGuild,
diff --git a/client/src/ui/components/BdSettingsWrapper.vue b/client/src/ui/components/BdSettingsWrapper.vue
index 196639a4..96c34a7b 100644
--- a/client/src/ui/components/BdSettingsWrapper.vue
+++ b/client/src/ui/components/BdSettingsWrapper.vue
@@ -9,8 +9,8 @@
 */
 
 <template>
-    <div class="bd-settings-wrapper" :class="[{active: active}, 'platform-' + this.platform]">
-        <div class="bd-settings-button" :class="{'bd-active': active, 'bd-animating': animating}" @click="active = true">
+    <div class="bd-settings-wrapper" :class="[{active}, 'platform-' + this.platform]">
+        <div class="bd-settings-button" :class="{'bd-active': active, 'bd-animating': animating, 'bd-hide-button': hideButton}" @click="active = true">
             <div v-if="updating === 0" v-tooltip.right="'Checking for updates'" class="bd-settings-button-btn bd-loading"></div>
             <div v-else-if="updating === 2" v-tooltip.right="'Updates available!'" class="bd-settings-button-btn bd-updates"></div>
             <div v-else class="bd-settings-button-btn" :class="[{'bd-loading': !loaded}]"></div>
@@ -36,7 +36,9 @@
                 timeout: null,
                 platform: process.platform,
                 eventHandlers: {},
-                keybindHandler: null
+                keybindHandler: null,
+                hideButton: false,
+                hideButtonToggleHandler: null
             };
         },
         components: {
@@ -80,6 +82,10 @@
 
             const menuKeybind = Settings.getSetting('core', 'default', 'menu-keybind');
             menuKeybind.on('keybind-activated', this.keybindHandler = () => this.active = !this.active);
+
+            const hideButtonSetting = Settings.getSetting('ui', 'default', 'hide-button');
+            hideButtonSetting.on('setting-updated', this.hideButtonToggleHandler = event => this.hideButton = event.value);
+            this.hideButton = hideButtonSetting.value;
         },
         destroyed() {
             for (let event in this.eventHandlers) Events.off(event, this.eventHandlers[event]);
@@ -89,7 +95,12 @@
 
             if (this.keybindHandler) {
                 const menuKeybind = Settings.getSetting('core', 'default', 'menu-keybind');
-                menuKeybind.removeListener('keybind-activated', this.keybindHandler = () => this.active = !this.active);
+                menuKeybind.removeListener('keybind-activated', this.keybindHandler);
+            }
+
+            if (this.hideButtonToggleHandler) {
+                const hideButtonSetting = Settings.getSetting('ui', 'default', 'hide-button');
+                hideButtonSetting.removeListener('setting-updated', this.hideButtonToggleHandler);
             }
         }
     }

From cb01d32e197a58c8f3a4761c5797f723b8383b19 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Fri, 10 Aug 2018 00:00:01 +0100
Subject: [PATCH 2/2] Fix position on macOS

---
 client/src/styles/partials/discordoverrides.scss | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/src/styles/partials/discordoverrides.scss b/client/src/styles/partials/discordoverrides.scss
index 42d668a9..84a697a3 100644
--- a/client/src/styles/partials/discordoverrides.scss
+++ b/client/src/styles/partials/discordoverrides.scss
@@ -1,10 +1,9 @@
 body:not(.bd-hide-button) {
     [class*="guildsWrapper-"] {
         padding-top: 49px !important;
-
-        .platform-osx & {
-            margin-top: 26px;
-        }
+    }
+    .platform-osx [class*="guildsWrapper-"] {
+        margin-top: 26px;
     }
 
     [class*="guildsWrapper-"] + [class*="flex"] {
@@ -13,10 +12,9 @@ body:not(.bd-hide-button) {
 
     [class*="unreadMentionsIndicatorTop-"] {
         top: 49px;
-
-        .platform-osx & {
-            top: 50px;
-        }
+    }
+    .platform-osx [class*="unreadMentionsIndicatorTop-"] {
+        top: 50px;
     }
 }