From dcaab3cfddbcf367b3d33d331e405335d502d474 Mon Sep 17 00:00:00 2001 From: Stefan Schimanski Date: Thu, 14 Jun 2007 17:57:07 +0000 Subject: [PATCH] * make close tab button smaller * remove spacing in the layout of the tab bar and the central widget git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18770 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiView.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 4125433958..a3073d4833 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include @@ -81,7 +81,7 @@ class TabWidget : public QWidget QHBoxLayout* hlayout; public: QTabBar* tabbar; - QToolButton* closeTabButton; + QPushButton* closeTabButton; void hideTabsIfNecessary() { @@ -96,24 +96,27 @@ public: TabWidget(QWidget* w, bool topTabBar) { - closeTabButton = new QToolButton(this); + closeTabButton = new QPushButton(this); FileName const file = support::libFileSearch("images", "closetab", "xpm"); if (!file.empty()) { QPixmap pm(toqstr(file.absFilename())); closeTabButton->setIcon(QIcon(pm)); + closeTabButton->setMaximumSize(pm.size()); + closeTabButton->setFlat(true); } else { closeTabButton->setText("Close"); } closeTabButton->setCursor(Qt::ArrowCursor); - closeTabButton->setAutoRaise(true); closeTabButton->setToolTip(tr("Close tab")); closeTabButton->setEnabled(true); tabbar = new QTabBar; +#if QT_VERSION >= 0x040200 + tabbar->setUsesScrollButtons(true); +#endif hlayout = new QHBoxLayout; QVBoxLayout* vlayout = new QVBoxLayout; hlayout->addWidget(tabbar); - hlayout->addStretch(1); hlayout->addWidget(closeTabButton); if (topTabBar) { vlayout->addLayout(hlayout); @@ -124,6 +127,7 @@ public: vlayout->addLayout(hlayout); } vlayout->setMargin(0); + vlayout->setSpacing(0); hlayout->setMargin(0); setLayout(vlayout); hideTabsIfNecessary(); -- 2.39.2