Merge pull request #651 from pangeachat/account-for-sidebar

Account for sidebar

lib/pangea/widgets/chat/message_selection_overlay.dart

@@ -190,40 +190,51 @@ class MessageSelectionOverlayState extends State<MessageSelectionOverlay> {
       ),
     );
 
-    final bool showDetails = Matrix.of(context)
+    final bool showDetails = (Matrix.of(context)
-            .store
+                .store
-            .getBool(SettingKeys.displayChatDetailsColumn) ??
+                .getBool(SettingKeys.displayChatDetailsColumn) ??
-        false;
+            false) &&
-
+        FluffyThemes.isThreeColumnMode(context) &&
-    return Expanded(
+        widget.controller.room.membership == Membership.join;
-      child: Stack(
+
-        children: [
+    return Stack(
-          AnimatedPositioned(
+      children: [
-            duration: FluffyThemes.animationDuration,
+        AnimatedPositioned(
-            left: 0,
+          duration: FluffyThemes.animationDuration,
-            right: showDetails ? FluffyThemes.columnWidth : 0,
+          left: 0,
-            bottom: adjustedOverlayBottomOffset == -1
+          right: showDetails ? FluffyThemes.columnWidth : 0,
-                ? overlayBottomOffset
+          bottom: adjustedOverlayBottomOffset == -1
-                : adjustedOverlayBottomOffset,
+              ? overlayBottomOffset
-            child: Align(
+              : adjustedOverlayBottomOffset,
-              alignment: Alignment.center,
+          child: Align(
-              child: overlayMessage,
+            alignment: Alignment.center,
-            ),
+            child: overlayMessage,
-          ),
-          Align(
-            alignment: Alignment.bottomCenter,
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                OverlayFooter(controller: widget.controller),
-              ],
-            ),
           ),
-          Material(
+        ),
-            child: OverlayHeader(controller: widget.controller),
+        Align(
+          alignment: Alignment.bottomCenter,
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    OverlayFooter(controller: widget.controller),
+                  ],
+                ),
+              ),
+              if (showDetails)
+                const SizedBox(
+                  width: FluffyThemes.columnWidth,
+                ),
+            ],
           ),
-        ],
+        ),
-      ),
+        Material(
+          child: OverlayHeader(controller: widget.controller),
+        ),
+      ],
     );
   }
 }