Remove app-region styles

2 files changed, 10 insertions, 35 deletions

diff --git a/gui/src/renderer/components/HeaderBar.tsx b/gui/src/renderer/components/HeaderBar.tsx
index cc73b1a292..87b9747449 100644
--- a/gui/src/renderer/components/HeaderBar.tsx
+++ b/gui/src/renderer/components/HeaderBar.tsx
@@ -23,14 +23,9 @@ const headerBarStyles = {
       paddingLeft: 12,
       paddingRight: 12,
     }),
-    platformOverride: {
-      darwin: Styles.createViewStyle({
-        paddingTop: 24,
-      }),
-      linux: Styles.createViewStyle({
-        appRegion: 'drag',
-      }),
-    },
+    darwin: Styles.createViewStyle({
+      paddingTop: 24,
+    }),
   },
   content: Styles.createViewStyle({
     flexDirection: 'row',
@@ -63,8 +58,7 @@ export default class HeaderBar extends Component<IHeaderBarProps> {
   public render() {
     const style = [
       headerBarStyles.container.base,
-      // @ts-ignore
-      headerBarStyles.container.platformOverride[process.platform],
+      process.platform === 'darwin' ? headerBarStyles.container.darwin : undefined,
       headerBarStyles.barStyle[this.props.barStyle],
       this.props.style,
     ];
@@ -109,31 +103,16 @@ interface ISettingsButtonProps {
   onPress?: () => void;
 }
 
-const settingsBarButtonStyles = {
-  container: {
-    base: Styles.createViewStyle({
-      cursor: 'default',
-      padding: 0,
-      marginLeft: 8,
-    }),
-    platformOverride: {
-      linux: Styles.createViewStyle({
-        appRegion: 'no-drag',
-      }),
-    },
-  },
-};
+const settingsBarButtonStyle = Styles.createButtonStyle({
+  cursor: 'default',
+  padding: 0,
+  marginLeft: 8,
+});
 
 export class SettingsBarButton extends Component<ISettingsButtonProps> {
   public render() {
     return (
-      <Button
-        style={[
-          settingsBarButtonStyles.container.base,
-          // @ts-ignore
-          settingsBarButtonStyles.container.platformOverride[process.platform],
-        ]}
-        onPress={this.props.onPress}>
+      <Button style={settingsBarButtonStyle} onPress={this.props.onPress}>
         <ImageView
           height={24}
           width={24}
diff --git a/gui/src/renderer/components/NavigationBar.tsx b/gui/src/renderer/components/NavigationBar.tsx
index f5d8fa82f4..dc5b6c91ea 100644
--- a/gui/src/renderer/components/NavigationBar.tsx
+++ b/gui/src/renderer/components/NavigationBar.tsx
@@ -28,7 +28,6 @@ const styles = {
     }),
     linux: Styles.createViewStyle({
       paddingTop: 12,
-      appRegion: 'drag',
     }),
   },
   navigationBarTitle: {
@@ -54,7 +53,6 @@ const styles = {
   buttonBarItem: {
     default: Styles.createButtonStyle({
       cursor: 'default',
-      appRegion: 'no-drag',
     }),
     content: Styles.createViewStyle({
       flexDirection: 'row',
@@ -70,7 +68,6 @@ const styles = {
   closeBarItem: {
     default: Styles.createViewStyle({
       cursor: 'default',
-      appRegion: 'no-drag',
     }),
     icon: Styles.createViewStyle({
       flex: 0,
@@ -83,7 +80,6 @@ const styles = {
       padding: 0,
       margin: 0,
       cursor: 'default',
-      appRegion: 'no-drag',
     }),
     content: Styles.createViewStyle({
       flexDirection: 'row',