From 8c29d3b7c496c9c4bd23b6a5be7aa04ca387b9da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Tue, 28 Nov 2017 10:54:32 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@326 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/application/ribbon.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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);