fix button duplication issue when tab bar in top mode
This commit is contained in:
+8
-2
@@ -67,6 +67,8 @@ class BrowserTopAppBar extends StatelessWidget {
|
|||||||
displayedSheet: null,
|
displayedSheet: null,
|
||||||
showContextualToolbar: false,
|
showContextualToolbar: false,
|
||||||
showQuickTabSwitcherBar: false,
|
showQuickTabSwitcherBar: false,
|
||||||
|
hideMainToolbarButtonsDuplicatedInContextualToolbar:
|
||||||
|
showContextualToolbar,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,6 +103,8 @@ class BrowserBottomAppBar extends StatelessWidget {
|
|||||||
showMainToolbar: showMainToolbar,
|
showMainToolbar: showMainToolbar,
|
||||||
showContextualToolbar: showContextualToolbar,
|
showContextualToolbar: showContextualToolbar,
|
||||||
showQuickTabSwitcherBar: showQuickTabSwitcherBar,
|
showQuickTabSwitcherBar: showQuickTabSwitcherBar,
|
||||||
|
hideMainToolbarButtonsDuplicatedInContextualToolbar:
|
||||||
|
showContextualToolbar,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,6 +131,7 @@ class BrowserTabBar extends HookConsumerWidget {
|
|||||||
final bool showContextualToolbar;
|
final bool showContextualToolbar;
|
||||||
final bool showQuickTabSwitcherBar;
|
final bool showQuickTabSwitcherBar;
|
||||||
final Sheet? displayedSheet;
|
final Sheet? displayedSheet;
|
||||||
|
final bool hideMainToolbarButtonsDuplicatedInContextualToolbar;
|
||||||
|
|
||||||
const BrowserTabBar({
|
const BrowserTabBar({
|
||||||
super.key,
|
super.key,
|
||||||
@@ -134,6 +139,7 @@ class BrowserTabBar extends HookConsumerWidget {
|
|||||||
required this.displayedSheet,
|
required this.displayedSheet,
|
||||||
required this.showContextualToolbar,
|
required this.showContextualToolbar,
|
||||||
required this.showQuickTabSwitcherBar,
|
required this.showQuickTabSwitcherBar,
|
||||||
|
this.hideMainToolbarButtonsDuplicatedInContextualToolbar = false,
|
||||||
});
|
});
|
||||||
|
|
||||||
static const contextualToolabarHeight = 54.0;
|
static const contextualToolabarHeight = 54.0;
|
||||||
@@ -176,13 +182,13 @@ class BrowserTabBar extends HookConsumerWidget {
|
|||||||
.value;
|
.value;
|
||||||
|
|
||||||
final tabsCountInContextual =
|
final tabsCountInContextual =
|
||||||
showContextualToolbar &&
|
hideMainToolbarButtonsDuplicatedInContextualToolbar &&
|
||||||
contextualConfigs.any(
|
contextualConfigs.any(
|
||||||
(c) => c.buttonId == ToolbarButtonId.tabsCount.name && c.isVisible,
|
(c) => c.buttonId == ToolbarButtonId.tabsCount.name && c.isVisible,
|
||||||
);
|
);
|
||||||
|
|
||||||
final menuInContextual =
|
final menuInContextual =
|
||||||
showContextualToolbar &&
|
hideMainToolbarButtonsDuplicatedInContextualToolbar &&
|
||||||
contextualConfigs.any(
|
contextualConfigs.any(
|
||||||
(c) =>
|
(c) =>
|
||||||
c.buttonId == ToolbarButtonId.navigationMenu.name && c.isVisible,
|
c.buttonId == ToolbarButtonId.navigationMenu.name && c.isVisible,
|
||||||
|
|||||||
Reference in New Issue
Block a user