Skip to content

Commit cc8c984

Browse files
committed
App::View: Split the view equally
1 parent 550fa7d commit cc8c984

File tree

3 files changed

+7
-25
lines changed

3 files changed

+7
-25
lines changed

App/Client/ViewSplitter.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,13 @@ int CViewSplitter::ActiveContainer(QWidget *pView)
379379
int CViewSplitter::SetSizes()
380380
{
381381
int w = 0, h = 0;
382+
if(0 == m_nCount)
383+
return 0;
382384
foreach(auto sp, m_Row) {
383385
for(int i = 0; i < sp->count(); i++) {
384386
auto pContainer = sp->widget(i);
385-
w = qMax(w, pContainer->minimumSizeHint().width());
386-
h = qMax(h, pContainer->minimumSizeHint().height());
387+
w = qMax(w, pContainer->frameGeometry().width());
388+
h = qMax(h, pContainer->frameGeometry().height());
387389
}
388390
}
389391

App/Client/ViewSplitterContainer.cpp

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CViewSplitterContainer::CViewSplitterContainer(QWidget *pView, CParameterApp *pP
2222
m_pTab->installEventFilter(this);
2323

2424
SetVisibleTab(true);
25-
m_pTab->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
25+
m_pTab->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
2626
if(m_pView) {
2727
m_pView->show();
2828
m_pTab->setWindowTitle(m_pView->windowTitle());
@@ -103,22 +103,6 @@ void CViewSplitterContainer::closeEvent(QCloseEvent *event)
103103
emit sigCloseView(m_pView);
104104
}
105105

106-
QSize CViewSplitterContainer::minimumSizeHint() const
107-
{
108-
int w = 0, h = 0;
109-
if(m_pTab) {
110-
w = m_pTab->minimumSizeHint().width();
111-
h = m_pTab->minimumSizeHint().height();
112-
}
113-
114-
if(m_pView) {
115-
w = qMax(w, m_pView->minimumSizeHint().width());
116-
h = h + m_pView->minimumSizeHint().height();
117-
}
118-
//qDebug(log) << "Width:" << w << "Height:" << h;
119-
return QSize(w, h);
120-
}
121-
122106
void CViewSplitterContainer::slotCustomContextMenuRequested(const QPoint &pos)
123107
{
124108
QPoint p = pos;
@@ -128,8 +112,8 @@ void CViewSplitterContainer::slotCustomContextMenuRequested(const QPoint &pos)
128112

129113
bool CViewSplitterContainer::eventFilter(QObject *watched, QEvent *event)
130114
{
131-
qDebug(log) << "Event filter:" << watched << event->type();
132-
if(event->type() == QEvent::MouseButtonPress)
115+
//qDebug(log) << "Event filter:" << watched << event->type();
116+
if(watched == m_pTab && event->type() == QEvent::MouseButtonPress)
133117
{
134118
emit sigFouceIn(m_pView);
135119
}

App/Client/ViewSplitterContainer.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ private Q_SLOTS:
4040
// QWidget interface
4141
protected:
4242
virtual void closeEvent(QCloseEvent *event) override;
43-
44-
// QWidget interface
45-
public:
46-
virtual QSize minimumSizeHint() const override;
4743
virtual bool eventFilter(QObject *watched, QEvent *event) override;
4844
};
4945

0 commit comments

Comments
 (0)