diff --git a/qad/application/ribbon.cpp b/qad/application/ribbon.cpp index 08f9856..8211763 100644 --- a/qad/application/ribbon.cpp +++ b/qad/application/ribbon.cpp @@ -5,6 +5,7 @@ Ribbon::Ribbon(QMainWindow * parent_): QToolBar() { tab = 0; + scroll_area = 0; delay_e = true; delay = 1000; hovered = -1; @@ -69,6 +70,7 @@ void Ribbon::init() { if (parent->menuBar() == 0) return; QList lm = parent->menuBar()->actions(), la; if (tab) delete tab; + if (scroll_area) delete scroll_area; tab = new ETabWidget(); tab->setObjectName("ribbon_tab_widget"); connect(tab, SIGNAL(tabHovered(int)), this, SLOT(tabHovered(int))); @@ -154,11 +156,11 @@ void Ribbon::init() { } setFloatable(false); setMovable(false); - scroll_area = new QScrollArea(); + /*scroll_area = new QScrollArea(); scroll_area->setFrameShape(QFrame::NoFrame); scroll_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); scroll_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); - scroll_area->setWidget(tab); + scroll_area->setWidget(tab);*/ _resize(); //addWidget(scroll_area); addWidget(tab);