Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

fix(flutter_desktop): alignment on filter and sort menu (#6337)

Richard Shiue71e7f54367bb
diff --git a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/setting_menu.dart b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/setting_menu.dart
index 5b66c3a149..4ed594581b 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/setting_menu.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/setting_menu.dart
@@ -2,7 +2,6 @@ import 'package:appflowy/plugins/database/application/database_controller.dart';
import 'package:appflowy/plugins/database/application/field/field_controller.dart';
import 'package:appflowy/plugins/database/grid/application/grid_accessory_bloc.dart';
import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';
-import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_menu.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/sort/sort_menu.dart';
import 'package:flowy_infra_ui/widget/spacing.dart';
@@ -55,27 +54,22 @@ class _DatabaseViewSettingContent extends StatelessWidget {
return BlocBuilder<DatabaseViewSettingExtensionBloc,
DatabaseViewSettingExtensionState>(
builder: (context, state) {
- return Padding(
- padding: EdgeInsets.symmetric(
- horizontal: GridSize.horizontalHeaderPadding,
- ),
- child: DecoratedBox(
- decoration: BoxDecoration(
- border: Border(
- bottom: BorderSide(
- color: Theme.of(context).dividerColor,
- ),
+ return DecoratedBox(
+ decoration: BoxDecoration(
+ border: Border(
+ bottom: BorderSide(
+ color: Theme.of(context).dividerColor,
),
),
- child: Padding(
- padding: const EdgeInsets.symmetric(vertical: 8.0),
- child: Row(
- children: [
- SortMenu(fieldController: fieldController),
- const HSpace(6),
- FilterMenu(fieldController: fieldController),
- ],
- ),
+ ),
+ child: Padding(
+ padding: const EdgeInsets.symmetric(vertical: 8.0),
+ child: Row(
+ children: [
+ SortMenu(fieldController: fieldController),
+ const HSpace(6),
+ FilterMenu(fieldController: fieldController),
+ ],
),
),
);
diff --git a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/tab_bar_view.dart b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/tab_bar_view.dart
index 52faf54c52..43da1a0849 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/tab_bar_view.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/tab_bar_view.dart
@@ -170,9 +170,15 @@ class _DatabaseTabBarViewState extends State<DatabaseTabBarView> {
final tabBar = state.tabBars[state.selectedIndex];
final controller =
state.tabBarControllerByViewId[tabBar.viewId]!.controller;
- return tabBar.builder.settingBarExtension(
- context,
- controller,
+ return Padding(
+ padding: EdgeInsets.symmetric(
+ horizontal:
+ context.read<DatabasePluginWidgetBuilderSize>().horizontalPadding,
+ ),
+ child: tabBar.builder.settingBarExtension(
+ context,
+ controller,
+ ),
);
}
}