SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@326 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2017-11-28 10:54:32 +00:00
parent db0cad735d
commit 8c29d3b7c4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qad/application/ribbon.cpp
View File

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