Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1160 from AppFlowy-IO/fix/view_action_auto_width

Browse Source 
fix: auto width for view action
This commit is contained in:
Nathan.fooo 2022-09-26 08:53:35 +08:00 committed by GitHub
commit 882043ef96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dart
View File

@ -106,8 +106,11 @@ class _SettingItem extends StatelessWidget {
height: 30,
child: FlowyButton(
isSelected: isSelected,
text: FlowyText.medium(action.title(),
fontSize: 12, color: theme.textColor),
text: FlowyText.medium(
action.title(),
fontSize: 12,
color: theme.textColor,
),
hoverColor: theme.hover,
onTap: () {
context

29
frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/add_button.dart
View File

@ -61,12 +61,20 @@ class ActionList {
itemBuilder: (context, index) => items[index],
anchorContext: anchorContext,
anchorDirection: AnchorDirection.bottomRight,
constraints: BoxConstraints.tight(const Size(120, 80)),
constraints: BoxConstraints(
minWidth: 120,
maxWidth: 280,
minHeight: items.length * (CreateItem.height),
maxHeight: items.length * (CreateItem.height),
),
);
}
}
class CreateItem extends StatelessWidget {
static const double height = 30;
static const double verticalPadding = 6;
final PluginBuilder pluginBuilder;
final Function(PluginBuilder) onSelected;
const CreateItem({
@ -85,11 +93,20 @@ class CreateItem extends StatelessWidget {
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => onSelected(pluginBuilder),
child: FlowyText.medium(
pluginBuilder.menuName,
color: theme.textColor,
fontSize: 12,
).padding(horizontal: 10, vertical: 6),
child: ConstrainedBox(
constraints: const BoxConstraints(
minWidth: 120,
minHeight: CreateItem.height,
),
child: Align(
alignment: Alignment.centerLeft,
child: FlowyText.medium(
pluginBuilder.menuName,
color: theme.textColor,
fontSize: 12,
).padding(horizontal: 10),
),
),
),
);
}

17
frontend/app_flowy/lib/workspace/presentation/home/menu/app/section/item.dart
View File

@ -53,7 +53,7 @@ class ViewSectionItem extends StatelessWidget {
_handleAction(context, action);
},
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
padding: const EdgeInsets.symmetric(vertical: 2),
child: InkWell(
onTap: () => onSelected(context.read<ViewBloc>().state.view),
child: FlowyHover(
@ -73,13 +73,18 @@ class ViewSectionItem extends StatelessWidget {
BuildContext context, bool onHover, ViewState state, Color iconColor) {
List<Widget> children = [
SizedBox(
width: 16,
height: 16,
child: state.view.renderThumbnail(iconColor: iconColor)),
width: 16,
height: 16,
child: state.view.renderThumbnail(iconColor: iconColor),
),
const HSpace(2),
Expanded(
child: FlowyText.regular(state.view.name,
fontSize: 12, overflow: TextOverflow.clip)),
child: FlowyText.regular(
state.view.name,
fontSize: 12,
overflow: TextOverflow.clip,
),
),
];
if (onHover || state.isEditing) {

2
frontend/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart
View File

@ -178,7 +178,7 @@ class FlowyVersionDescription extends StatelessWidget {
),
],
).padding(
horizontal: ActionListSizes.itemHPadding + ActionListSizes.padding,
horizontal: ActionListSizes.itemHPadding + ActionListSizes.hPadding,
);
} else {
return const CircularProgressIndicator();

11
frontend/app_flowy/lib/workspace/presentation/widgets/pop_up_action.dart
View File

@ -49,8 +49,8 @@ abstract class ActionList<T extends ActionItem> {
anchorContext: anchorContext ?? buildContext,
anchorDirection: anchorDirection,
constraints: BoxConstraints(
minHeight: items.length * (itemHeight + ActionListSizes.padding * 2),
maxHeight: items.length * (itemHeight + ActionListSizes.padding * 2),
minHeight: items.length * (itemHeight + ActionListSizes.vPadding * 2),
maxHeight: items.length * (itemHeight + ActionListSizes.vPadding * 2),
maxWidth: maxWidth,
minWidth: minWidth,
),
@ -69,7 +69,8 @@ abstract class ActionItem {
class ActionListSizes {
static double itemHPadding = 10;
static double itemHeight = 20;
static double padding = 6;
static double vPadding = 6;
static double hPadding = 10;
}
class ActionCell<T extends ActionItem> extends StatelessWidget {
@ -104,8 +105,8 @@ class ActionCell<T extends ActionItem> extends StatelessWidget {
],
),
).padding(
horizontal: ActionListSizes.padding,
vertical: ActionListSizes.padding,
horizontal: ActionListSizes.hPadding,
vertical: ActionListSizes.vPadding,
),
),
);

2
frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dart
View File

@ -30,7 +30,7 @@ class AppFlowyPopover extends StatelessWidget {
this.offset,
this.controller,
this.asBarrier = false,
this.margin = const EdgeInsets.all(12),
this.margin = const EdgeInsets.all(6),
}) : super(key: key);
@override

2
frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/list_overlay.dart
View File

@ -60,7 +60,7 @@ class ListOverlay extends StatelessWidget {
scrollDirection: Axis.horizontal,
child: IntrinsicWidth(
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.max,
children: [
...children,
if (footer != null)