aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-08-25 21:43:55 +0530
committerLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-08-25 22:12:49 +0530
commit890780b900850d8023be30ed137db0a04932bec3 (patch)
tree180377a0d87a508484830670b1e43fafd1b63c47 /src
parentchore: upgraded 'electron-builder' to '22.13.0' (diff)
downloadferdium-app-890780b900850d8023be30ed137db0a04932bec3.tar.gz
ferdium-app-890780b900850d8023be30ed137db0a04932bec3.tar.zst
ferdium-app-890780b900850d8023be30ed137db0a04932bec3.zip
fix: fix reordering of services in vertical style layout
fixes #1833
Diffstat (limited to 'src')
-rw-r--r--src/components/layout/Sidebar.js1
-rw-r--r--src/components/services/tabs/Tabbar.js8
2 files changed, 7 insertions, 2 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index a9fb73f33..a1a4ab64f 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -134,6 +134,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
134 {...this.props} 134 {...this.props}
135 enableToolTip={() => this.enableToolTip()} 135 enableToolTip={() => this.enableToolTip()}
136 disableToolTip={() => this.disableToolTip()} 136 disableToolTip={() => this.disableToolTip()}
137 useVerticalStyle={stores.settings.all.app.useVerticalStyle}
137 /> 138 />
138 { isLoggedIn ? ( 139 { isLoggedIn ? (
139 <> 140 <>
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index ab1e46c9f..c1421a2b1 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -20,6 +20,7 @@ export default @observer class TabBar extends Component {
20 updateService: PropTypes.func.isRequired, 20 updateService: PropTypes.func.isRequired,
21 hibernateService: PropTypes.func.isRequired, 21 hibernateService: PropTypes.func.isRequired,
22 wakeUpService: PropTypes.func.isRequired, 22 wakeUpService: PropTypes.func.isRequired,
23 useVerticalStyle: PropTypes.bool.isRequired,
23 showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, 24 showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
24 showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, 25 showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
25 }; 26 };
@@ -81,10 +82,13 @@ export default @observer class TabBar extends Component {
81 toggleAudio, 82 toggleAudio,
82 toggleDarkMode, 83 toggleDarkMode,
83 deleteService, 84 deleteService,
85 useVerticalStyle,
84 showMessageBadgeWhenMutedSetting, 86 showMessageBadgeWhenMutedSetting,
85 showMessageBadgesEvenWhenMuted, 87 showMessageBadgesEvenWhenMuted,
86 } = this.props; 88 } = this.props;
87 89
90 const axis = useVerticalStyle ? 'x' : 'y';
91
88 return ( 92 return (
89 <div> 93 <div>
90 <TabBarSortableList 94 <TabBarSortableList
@@ -104,8 +108,8 @@ export default @observer class TabBar extends Component {
104 wakeUpService={(args) => this.wakeUpService(args)} 108 wakeUpService={(args) => this.wakeUpService(args)}
105 openSettings={openSettings} 109 openSettings={openSettings}
106 distance={20} 110 distance={20}
107 axis="y" 111 axis={axis}
108 lockAxis="y" 112 lockAxis={axis}
109 helperClass="is-reordering" 113 helperClass="is-reordering"
110 showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting} 114 showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting}
111 showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted} 115 showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted}