beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

UI/Qt: Manually paint the tab-bar background where the "add" button was

Browse source 
The TabBar itself does not stretch the entire width of the TabWidget,
because it leaves space for the width of the new-tab button. So, we
manually tell Qt to paint the TabBar's background into the gap.

Fixes #768.
This commit is contained in:
Sam Atkins 2024-07-26 14:39:26 +01:00 committed by Alexander Kalenik
parent e17362ab79
commit 06484d0663
Notes: github-actions[bot] 2024-07-29 10:02:56 +00:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/LadybirdBrowser/ladybird/commit/06484d0663c
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/843
Reviewed-by: https://github.com/jamierocks
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Ladybird/Qt/TabBar.cpp
View file

@ -57,6 +57,32 @@ TabWidget::TabWidget(QWidget* parent)
installEventFilter(parent);
}
void TabWidget::paintEvent(QPaintEvent*)
{
auto prepare_style_options = [](QTabBar* tab_bar, QSize widget_size) {
QStyleOptionTabBarBase style_options;
QStyleOptionTab tab_overlap;
tab_overlap.shape = tab_bar->shape();
auto overlap = tab_bar->style()->pixelMetric(QStyle::PM_TabBarBaseOverlap, &tab_overlap, tab_bar);
style_options.initFrom(tab_bar);
style_options.shape = tab_bar->shape();
style_options.documentMode = tab_bar->documentMode();
// NOTE: This assumes the tab bar is at the top of the tab widget.
style_options.rect = { 0, widget_size.height() - overlap, widget_size.width(), overlap };
return style_options;
};
QStylePainter painter { this, tabBar() };
if (auto* widget = cornerWidget(Qt::TopRightCorner)) {
// Manually paint the background for the area where the "new tab" button would have been
// if we hadn't relocated it in `TabStyle::subElementRect()`.
auto style_options = prepare_style_options(tabBar(), widget->size());
style_options.rect.translate(tabBar()->rect().width(), widget->y());
painter.drawPrimitive(QStyle::PE_FrameTabBarBase, style_options);
}
}
TabBarButton::TabBarButton(QIcon const& icon, QWidget* parent)
: QPushButton(icon, {}, parent)
{

2
Ladybird/Qt/TabBar.h
View file

@ -35,6 +35,8 @@ class TabWidget : public QTabWidget {
public:
explicit TabWidget(QWidget* parent = nullptr);
virtual void paintEvent(QPaintEvent*) override;
};
class TabBarButton : public QPushButton {