mirror of
https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
synced 2024-12-25 23:51:33 +08:00
Fixed Qt6 build
This commit is contained in:
parent
32eaf93692
commit
35f212a788
@ -573,18 +573,20 @@ void CAutoHideDockContainer::leaveEvent(QEvent *event)
|
||||
|
||||
|
||||
//============================================================================
|
||||
void CAutoHideDockContainer::enterEvent(QEvent *event)
|
||||
bool CAutoHideDockContainer::event(QEvent* event)
|
||||
{
|
||||
d->forwardEventToDockContainer(event);
|
||||
Super::enterEvent(event);
|
||||
}
|
||||
switch (event->type())
|
||||
{
|
||||
case QEvent::Enter:
|
||||
case QEvent::Hide:
|
||||
d->forwardEventToDockContainer(event);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void CAutoHideDockContainer::hideEvent(QHideEvent *event)
|
||||
{
|
||||
d->forwardEventToDockContainer(event);
|
||||
Super::hideEvent(event);
|
||||
return Super::event(event);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -64,8 +64,7 @@ protected:
|
||||
virtual bool eventFilter(QObject* watched, QEvent* event) override;
|
||||
virtual void resizeEvent(QResizeEvent* event) override;
|
||||
virtual void leaveEvent(QEvent *event) override;
|
||||
virtual void enterEvent(QEvent *event) override;
|
||||
virtual void hideEvent(QHideEvent *event) override;
|
||||
virtual bool event(QEvent* event) override;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -226,29 +226,22 @@ void CAutoHideTab::setDockWidget(CDockWidget* DockWidget)
|
||||
|
||||
|
||||
//============================================================================
|
||||
void CAutoHideTab::enterEvent(QEvent *event)
|
||||
bool CAutoHideTab::event(QEvent* event)
|
||||
{
|
||||
d->forwardEventToDockContainer(event);
|
||||
Super::enterEvent(event);
|
||||
switch (event->type())
|
||||
{
|
||||
case QEvent::Enter:
|
||||
case QEvent::Leave:
|
||||
case QEvent::MouseButtonPress:
|
||||
d->forwardEventToDockContainer(event);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return Super::event(event);
|
||||
}
|
||||
|
||||
|
||||
//============================================================================
|
||||
void CAutoHideTab::leaveEvent(QEvent *event)
|
||||
{
|
||||
d->forwardEventToDockContainer(event);
|
||||
Super::leaveEvent(event);
|
||||
}
|
||||
|
||||
|
||||
//============================================================================
|
||||
void CAutoHideTab::mousePressEvent(QMouseEvent* event)
|
||||
{
|
||||
d->forwardEventToDockContainer(event);
|
||||
Super::mousePressEvent(event);
|
||||
}
|
||||
|
||||
|
||||
//============================================================================
|
||||
bool CAutoHideTab::iconOnly() const
|
||||
{
|
||||
|
@ -68,9 +68,7 @@ protected:
|
||||
|
||||
void setSideBar(CAutoHideSideBar *SideTabBar);
|
||||
void removeFromSideBar();
|
||||
virtual void enterEvent(QEvent *event) override;
|
||||
virtual void leaveEvent(QEvent *event) override;
|
||||
virtual void mousePressEvent(QMouseEvent* event) override;
|
||||
virtual bool event(QEvent* event) override;
|
||||
|
||||
public:
|
||||
using Super = CPushButton;
|
||||
|
Loading…
Reference in New Issue
Block a user