Skip to content

Commit

Permalink
fix: redefinition of verticalTabs
Browse files Browse the repository at this point in the history 
Function verticalTabs is exposed by qtabbar_p.h as constexpr static
inline, original definition in dtabbar.cpp will lead to an redefinition
error. Just rename dtk's implementation.

Note: Probably we should replace private implementaion with Qt's
implementation after all versions of Qt expose this function.
Log: fix redefinition of verticalTabs
  • Loading branch information
@asterwyx
asterwyx committed Oct 26, 2023
1 parent 42e3191 commit feb1a69
Showing 1 changed file with 23 additions and 22 deletions.
45 changes: 23 additions & 22 deletions src/widgets/dtabbar.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@

DWIDGET_BEGIN_NAMESPACE

inline static bool verticalTabs(QTabBar::Shape shape)
// TODO: Replace with verticalTabs in qtabbar_p.h when all versions of Qt support.
constexpr inline static bool _dtk_verticalTabs(QTabBar::Shape shape)
{
return shape == QTabBar::RoundedWest
|| shape == QTabBar::RoundedEast
Expand All @@ -44,7 +45,7 @@ inline static bool verticalTabs(QTabBar::Shape shape)
// QBoxLayout::Direction与QTabBar::Shape之间的映射
inline static QBoxLayout::Direction shapeToDirection (const QTabBar::Shape shape)
{
if (verticalTabs(shape)) {
if (_dtk_verticalTabs(shape)) {
return QBoxLayout::TopToBottom;
} else {
return QBoxLayout::LeftToRight;
Expand Down Expand Up @@ -273,7 +274,7 @@ class DTabBarPrivate : public QTabBar, public DObjectPrivate
// 更新布局内的控件的对齐方式
void updateTabAlignment()
{
Qt::Alignment tabAlignment = verticalTabs(shape()) ?
Qt::Alignment tabAlignment = _dtk_verticalTabs(shape()) ?
Qt::AlignHCenter : Qt::AlignVCenter;

for (int i = 0; i < layout->count(); i++) {
Expand Down Expand Up @@ -498,7 +499,7 @@ void DTabBarPrivate::setupMovableTab()

int taboverlap = style()->pixelMetric(QStyle::PM_TabBarTabOverlap, 0, this);
QRect grabRect = tabRect(d->pressedIndex);
if (verticalTabs(shape()))
if (_dtk_verticalTabs(shape()))
grabRect.adjust(0, -taboverlap, 0, taboverlap);
else
grabRect.adjust(-taboverlap, 0, taboverlap, 0);
Expand All @@ -516,7 +517,7 @@ void DTabBarPrivate::setupMovableTab()
QStyleOptionTab tab;
initStyleOption(&tab, d->pressedIndex);
tab.position = QStyleOptionTab::OnlyOneTab;
if (verticalTabs(shape()))
if (_dtk_verticalTabs(shape()))
tab.rect.moveTopLeft(QPoint(0, taboverlap));
else
tab.rect.moveTopLeft(QPoint(taboverlap, 0));
Expand Down Expand Up @@ -546,7 +547,7 @@ void DTabBarPrivate::updateMoveingTabPosition(const QPoint &mouse)
{
QTabBarPrivate *d = reinterpret_cast<QTabBarPrivate *>(qGetPtrHelper(d_ptr));

bool vertical = verticalTabs(d->shape);
bool vertical = _dtk_verticalTabs(d->shape);
int dragDistance;
if (vertical) {
dragDistance = (mouse.y() - d->dragStartPosition.y());
Expand Down Expand Up @@ -652,7 +653,7 @@ void DTabBarPrivate::slide(int from, int to)
|| !d->validIndex(from)
|| !d->validIndex(to))
return;
bool vertical = verticalTabs(d->shape);
bool vertical = _dtk_verticalTabs(d->shape);
int preLocation = vertical ? tabRect(from).y() : tabRect(from).x();
setUpdatesEnabled(false);
moveTab(from, to);
Expand Down Expand Up @@ -686,7 +687,7 @@ void DTabBarPrivate::layoutTab(int index)
Q_ASSERT(index >= 0);
QTabBarPrivate *d = reinterpret_cast<QTabBarPrivate *>(qGetPtrHelper(d_ptr));
QTabBarPrivate::Tab *tab = d->at(index);
bool vertical = verticalTabs(d->shape);
bool vertical = _dtk_verticalTabs(d->shape);

if (!(tab->leftWidget || tab->rightWidget))
return;
Expand Down Expand Up @@ -767,7 +768,7 @@ void DTabBarPrivate::makeVisible(int index)
const QRect tabRect = d->at(index)->rect;

const int oldScrollOffset = d->scrollOffset;
const bool horiz = !verticalTabs(d->shape);
const bool horiz = !_dtk_verticalTabs(d->shape);
const int extra_width = 2 * qMax(style()->pixelMetric(QStyle::PM_TabBarScrollButtonWidth, 0, this),
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QApplication::globalStrut().width());
Expand Down Expand Up @@ -801,7 +802,7 @@ void DTabBarPrivate::autoScrollTabs(const QPoint &mouse)
}

QTabBarPrivate *d = reinterpret_cast<QTabBarPrivate *>(qGetPtrHelper(d_ptr));
bool vertical = verticalTabs(d->shape);
bool vertical = _dtk_verticalTabs(d->shape);
const QSize &size_hint = this->size();
int scroll_distance = qMin(50, vertical ? rect.height() / 3 : rect.width() / 3);

Expand Down Expand Up @@ -895,7 +896,7 @@ void DTabBarPrivate::ensureScrollTabsAnimation()
d->scrollOffset = v;

if (d->dragInProgress && d->validIndex(d->pressedIndex)) {
if (verticalTabs(d->shape)) {
if (_dtk_verticalTabs(d->shape)) {
d->dragStartPosition.setY(dragStartPosition.y() + scrollOffset - v);
} else {
d->dragStartPosition.setX(dragStartPosition.x() + scrollOffset - v);
Expand Down Expand Up @@ -993,7 +994,7 @@ int DTabBarPrivate::tabInsertIndexFromMouse(QPoint pos)
int current = tabAt(pos);

QTabBarPrivate *d = reinterpret_cast<QTabBarPrivate *>(qGetPtrHelper(d_ptr));
bool vertical = verticalTabs(this->shape());
bool vertical = _dtk_verticalTabs(this->shape());

if (!d->validIndex(current)){
if (vertical)
Expand Down Expand Up @@ -1205,7 +1206,7 @@ void DTabBarPrivate::paintEvent(QPaintEvent *e)
int selected = -1;
int cutLeft = -1;
int cutRight = -1;
bool vertical = verticalTabs(d->shape);
bool vertical = _dtk_verticalTabs(d->shape);
QStyleOptionTab cutTabLeft;
QStyleOptionTab cutTabRight;
selected = d->currentIndex;
Expand All @@ -1226,7 +1227,7 @@ void DTabBarPrivate::paintEvent(QPaintEvent *e)
initStyleOption(&tab, i);
// 强制让文本居中
tab.rightButtonSize = QSize();

if (d->paintWithOffsets && d->at(i)->dragOffset != 0) {
if (vertical) {
tab.rect.moveTop(tab.rect.y() + d->at(i)->dragOffset);
Expand Down Expand Up @@ -1298,7 +1299,7 @@ void DTabBarPrivate::paintEvent(QPaintEvent *e)
}
} else {
int taboverlap = style()->pixelMetric(QStyle::PM_TabBarTabOverlap, 0, this);
if (verticalTabs(d->shape))
if (_dtk_verticalTabs(d->shape))
d->movingTab->setGeometry(tab.rect.adjusted(-taboverlap, 0, taboverlap, 0));
else
d->movingTab->setGeometry(tab.rect.adjusted(-taboverlap, 0, taboverlap, 0));
Expand Down Expand Up @@ -1339,7 +1340,7 @@ void DTabBarPrivate::mouseMoveEvent(QMouseEvent *event)
#endif
bool valid_pressed_index = d->validIndex(d->pressedIndex);

if (verticalTabs(d->shape)) {
if (_dtk_verticalTabs(d->shape)) {
std::swap(offset_x, offset_y);
}

Expand Down Expand Up @@ -1541,7 +1542,7 @@ QTabBarPrivate *DTabBarPrivate::dd() const
@class Dtk::Widget::DTabBar
\inmodule dtkwidget
@brief DTabBar is a tab bar control that is an extension and enhancement of QTabBar
Added many features, such as a new button and support for dragging and dropping events outward This control is currently used in the depth editor.
*/

Expand Down Expand Up @@ -1726,8 +1727,8 @@ void DTabBar::setShape(QTabBar::Shape shape)
{
D_D(DTabBar);

bool old_vertical = verticalTabs(d_func()->shape());
bool new_vertical = verticalTabs(shape);
bool old_vertical = _dtk_verticalTabs(d_func()->shape());
bool new_vertical = _dtk_verticalTabs(shape);

d->setShape(shape);

Expand Down Expand Up @@ -1865,7 +1866,7 @@ QString DTabBar::tabText(int index) const
/*!
@~english
@brief Set the text of the label at the specified index position.
@param[in] index Label index.
@param[in] text Label text.
*/
Expand Down Expand Up @@ -2086,7 +2087,7 @@ bool DTabBar::tabsClosable() const
@~english
@brief Set whether the tab bar is closable or not.
@param[in] closable the label is closable or not
@param[in] closable the label is closable or not
*/
void DTabBar::setTabsClosable(bool closable)
{
Expand Down Expand Up @@ -2559,7 +2560,7 @@ QSize DTabBar::tabSizeHint(int index) const
QSize size = d->QTabBar::tabSizeHint(index);

QTabBarPrivate *dd = reinterpret_cast<QTabBarPrivate *>(qGetPtrHelper(d->d_ptr));
bool is_vertical = verticalTabs(dd->shape);
bool is_vertical = _dtk_verticalTabs(dd->shape);

if (is_vertical) {
size.setWidth(qMax(size.width(), dd->leftB->width()));
Expand Down

0 comments on commit feb1a69

Please sign in to comment.