commit 18b74073fa8019b6c6300f6758ec1a348c2de237
author Sanjay Chouksey <sanjayc@google.com> Sat Jul 11 15:29:52 2020 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Sat Jul 11 15:29:52 2020 +0000
tree b838d767aa70b737ce84bf434a4198d380885230
parent 69b6cdef14850657dfbe268c6a4586b270bd3288

[ermine] Fix key input on terminal being prevented by ermine shell

This change fixes the issue where key input stops working on terminal
under certain conditions. See: http://fxb/55966 for more details.

Test: All unittests pass
Bug: 55966

Change-Id: Ibd8bef893a87c27aceb0164b53b6106a10ecd1a7
Reviewed-on: https://fuchsia-review.googlesource.com/c/experiences/+/406170
Reviewed-by: Chase Latta <chaselatta@google.com>
Testability-Review: Chase Latta <chaselatta@google.com>
Commit-Queue: Sanjay Chouksey <sanjayc@google.com>

session_shells/ermine/shell/lib/src/widgets/story/tile_chrome.dart

diff --git a/session_shells/ermine/shell/lib/src/widgets/story/tile_chrome.dart b/session_shells/ermine/shell/lib/src/widgets/story/tile_chrome.dart
index f4443f1..8283da1 100644
--- a/session_shells/ermine/shell/lib/src/widgets/story/tile_chrome.dart
+++ b/session_shells/ermine/shell/lib/src/widgets/story/tile_chrome.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:internationalization/strings.dart';
 
 import '../../utils/styles.dart';
 
@@ -51,19 +50,32 @@
 
   @override
   Widget build(BuildContext context) {
-    Widget chrome = GestureDetector(
+    return GestureDetector(
       behavior: HitTestBehavior.translucent,
       // Disable listview scrolling on top of story.
       onHorizontalDragStart: (_) {},
       onTap: onTap,
       child: Stack(
         children: [
+          // Title.
+          Positioned(
+            left: 0,
+            top: 0,
+            right: 0,
+            height: ErmineStyle.kStoryTitleHeight,
+            child: showTitle ? _buildTitlebar(context) : Offstage(),
+          ),
+
           // Border.
-          Positioned.fill(
+          Positioned(
+            left: 0,
+            top: fullscreen ? 0 : ErmineStyle.kStoryTitleHeight,
+            right: 0,
+            bottom: 0,
             child: Container(
               padding: showTitle
                   ? EdgeInsets.only(
-                      top: ErmineStyle.kStoryTitleHeight,
+                      top: fullscreen ? ErmineStyle.kStoryTitleHeight : 0,
                       left: ErmineStyle.kBorderWidth,
                       right: ErmineStyle.kBorderWidth,
                       bottom: ErmineStyle.kBorderWidth,
@@ -75,88 +87,28 @@
               ),
             ),
           ),
-
-          // Title.
-          Positioned(
-            left: 0,
-            top: 0,
-            right: 0,
-            height: ErmineStyle.kStoryTitleHeight,
-            child: showTitle ? _buildTitlebar(context) : Offstage(),
-          )
         ],
       ),
     );
-    return draggable
-        ? Draggable(
-            child: chrome,
-            feedback: SizedBox(
-              width: width,
-              height: height,
-              child: chrome,
-            ),
-            childWhenDragging: Container(),
-            onDragCompleted: () => print('onDragCompleted'),
-            onDraggableCanceled: (velocity, offset) =>
-                onDragComplete?.call(offset),
-          )
-        : chrome;
   }
 
   Widget _buildTitlebar(BuildContext context) => Row(
         crossAxisAlignment: CrossAxisAlignment.center,
         children: <Widget>[
-          if (editing)
-            Padding(
-              padding: EdgeInsets.only(left: 8),
-            ),
-
           // Minimize button.
-          if (!editing && focused)
-            _buildIconButton(maximize: false, onTap: onDelete),
-
-          // Cancel edit button.
-          if (editing)
-            _buildTitleBarTextButton(context, Strings.cancel, onTapCancel),
+          if (focused) _buildIconButton(maximize: false, onTap: onDelete),
 
           // Story name.
           Expanded(
-            child: editing
-                ? TextField(
-                    controller: titleFieldController,
-                    autofocus: true,
-                    onSubmitted: (_) => onTapDone(),
-                    cursorWidth: 8,
-                    cursorRadius: Radius.zero,
-                    cursorColor: Colors.white,
-                    textAlign: TextAlign.center,
-                    decoration: InputDecoration(
-                      contentPadding: EdgeInsets.zero,
-                      // TODO(fmil): I18N There should be no hard-coded paddings in the text.
-                      hintText:
-                          '              ${Strings.nameThisStory.toUpperCase()}',
-                      border: InputBorder.none,
-                      isDense: true,
-                    ),
-                  )
-                : _buildTitleBarTextButton(context, name ?? '<>', onEdit),
+            child: _buildTitleBarTextButton(context, name ?? '<>', onEdit),
           ),
 
           // Maximize button.
-          if (!editing && focused)
+          if (focused)
             _buildIconButton(
               maximize: true,
               onTap: fullscreen ? onMinimize : onFullscreen,
             ),
-
-          // Done edit button.
-          if (editing)
-            _buildTitleBarTextButton(context, Strings.done, onTapDone),
-
-          if (editing)
-            Padding(
-              padding: EdgeInsets.only(left: 8),
-            ),
         ],
       );