From c3c9d5f7fca0e81007a2ce55447d6d89cc9d842b 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: Thu, 25 Oct 2018 10:43:09 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@454 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/application/ribbon.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qad/application/ribbon.cpp b/qad/application/ribbon.cpp index 84d5d2e..5a9c9f6 100644 --- a/qad/application/ribbon.cpp +++ b/qad/application/ribbon.cpp @@ -77,12 +77,13 @@ void Ribbon::init() { connect(tab, SIGNAL(tabHovered(int)), this, SLOT(tabHovered(int))); connect(tab, SIGNAL(currentChanged(int)), this, SIGNAL(currentTabChanged(int))); tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - QGroupBox * g; + QFrame * g; QBoxLayout * l, * tl; QToolButton * b; //tab->setIconSize(QSize(32, 32)); foreach (QAction * i, lm) { - if (i->menu() == 0) continue; + if (!i->menu()) continue; + //if (!i->menu()->isVisible()) continue; la = i->menu()->actions(); QIcon tic = i->icon(); if (!tic.isNull()) @@ -112,7 +113,7 @@ void Ribbon::init() { #else tl->setContentsMargins(2, 0, 2, 2); #endif - g = new QGroupBox(); + g = new QFrame(); g->setFrameShape(QFrame::StyledPanel); l = new QBoxLayout(QBoxLayout::LeftToRight); g->setLayout(l); l->setSpacing(2); @@ -121,7 +122,7 @@ void Ribbon::init() { if (j->isSeparator()) { if (l->isEmpty()) continue; tl->addWidget(g); - g = new QGroupBox(); + g = new QFrame(); g->setFrameShape(QFrame::StyledPanel); l = new QBoxLayout(QBoxLayout::LeftToRight); l->setSpacing(2); l->setContentsMargins(2, 2, 2, 2);