revert last bogus commit
svn path=/trunk/KDE/kdelibs/; revision=1042383
This commit is contained in:
parent
7e8d330582
commit
4418fb8971
@ -126,7 +126,6 @@ void TabBarPrivate::updateTabWidgetMode()
|
||||
mainLayout->removeAt(0);
|
||||
tabBarLayout->removeAt(1);
|
||||
mainLayout->addItem(tabProxy);
|
||||
q->setPreferredSize(-1, -1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -145,11 +144,7 @@ void TabBarPrivate::slidingCompleted(QGraphicsItem *item)
|
||||
if (item == oldPage || item == newPage) {
|
||||
if (item == newPage) {
|
||||
tabWidgetLayout->addItem(newPage);
|
||||
mainLayout->invalidate();
|
||||
//FIXME: usual QGraphicsLayout hack
|
||||
q->setPreferredSize(mainLayout->effectiveSizeHint(Qt::PreferredSize));
|
||||
newPageAnimId = -1;
|
||||
emit q->currentChanged(currentIndex);
|
||||
} else {
|
||||
oldPageAnimId = -1;
|
||||
item->hide();
|
||||
@ -218,14 +213,11 @@ TabBar::TabBar(QGraphicsWidget *parent)
|
||||
: QGraphicsWidget(parent),
|
||||
d(new TabBarPrivate(this))
|
||||
{
|
||||
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
d->tabProxy = new TabBarProxy(this);
|
||||
d->tabWidgetLayout = new QGraphicsLinearLayout(Qt::Vertical);
|
||||
d->tabWidgetLayout->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
d->tabBarLayout = new QGraphicsLinearLayout(Qt::Horizontal);
|
||||
|
||||
d->mainLayout = new QGraphicsLinearLayout(Qt::Horizontal);
|
||||
d->mainLayout->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
d->mainLayout->addItem(d->tabWidgetLayout);
|
||||
|
||||
setLayout(d->mainLayout);
|
||||
@ -259,13 +251,13 @@ int TabBar::insertTab(int index, const QIcon &icon, const QString &label,
|
||||
QGraphicsLayoutItem *content)
|
||||
{
|
||||
QGraphicsWidget *page = new QGraphicsWidget(this);
|
||||
page->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
page->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||
if (content) {
|
||||
if (content->isLayout()) {
|
||||
page->setLayout(static_cast<QGraphicsLayout *>(content));
|
||||
} else {
|
||||
QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical, page);
|
||||
layout->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
layout->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||
layout->addItem(content);
|
||||
page->setLayout(layout);
|
||||
}
|
||||
@ -402,6 +394,7 @@ void TabBar::setCurrentIndex(int index)
|
||||
}
|
||||
|
||||
d->currentIndex = index;
|
||||
emit currentChanged(index);
|
||||
d->tabProxy->native->setCurrentIndex(index);
|
||||
}
|
||||
|
||||
|
@ -231,8 +231,6 @@ protected:
|
||||
private:
|
||||
TabBarPrivate * const d;
|
||||
|
||||
friend class TabBarPrivate;
|
||||
|
||||
Q_PRIVATE_SLOT(d, void slidingCompleted(QGraphicsItem *item))
|
||||
Q_PRIVATE_SLOT(d, void shapeChanged(const QTabBar::Shape shape))
|
||||
Q_PRIVATE_SLOT(d, void setPalette())
|
||||
|
Loading…
Reference in New Issue
Block a user