Compare commits

...

4 Commits

Author SHA1 Message Date
Uwe Kindler
65600a4dcd Removed unimolemented superfluous function definitions 2023-07-14 08:07:37 +02:00
Uwe Kindler
ac1879d5cb Added missing README images 2023-07-13 13:59:48 +02:00
Uwe Kindler
f00ef60fb3 Merge remote-tracking branch 'remotes/origin/autohide_drag' 2023-07-13 13:58:08 +02:00
Nicolas Elie
6e642ec423 Update PyQt bindings to 4.0.4 (#532) 2023-07-03 14:09:48 +02:00
16 changed files with 11 additions and 17 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 559 KiB

BIN
doc/AutoHide_Sort_Tabs.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 KiB

View File

@@ -28,6 +28,8 @@ public:
Qt::Orientation orientation() const; Qt::Orientation orientation() const;
ads::CAutoHideTab* tabAt(int index) const; ads::CAutoHideTab* tabAt(int index) const;
int tabCount() const; int tabCount() const;
int visibleTabCount() const;
bool hasVisibleTabs() const;
ads::SideBarLocation sideBarLocation() const; ads::SideBarLocation sideBarLocation() const;
virtual QSize minimumSizeHint() const; virtual QSize minimumSizeHint() const;
virtual QSize sizeHint() const; virtual QSize sizeHint() const;

View File

@@ -23,6 +23,7 @@ public:
ads::CDockWidget* focusedDockWidget() const; ads::CDockWidget* focusedDockWidget() const;
void setDockWidgetTabFocused(ads::CDockWidgetTab* Tab); void setDockWidgetTabFocused(ads::CDockWidgetTab* Tab);
void clearDockWidgetFocus(ads::CDockWidget* dockWidget); void clearDockWidgetFocus(ads::CDockWidget* dockWidget);
void setDockWidgetTabPressed(bool Value);
public slots: public slots:
void setDockWidgetFocused(ads::CDockWidget* focusedNow); void setDockWidgetFocused(ads::CDockWidget* focusedNow);

View File

@@ -188,6 +188,7 @@ public:
AutoHideSideBarsIconOnly, AutoHideSideBarsIconOnly,
AutoHideShowOnMouseOver, AutoHideShowOnMouseOver,
DefaultAutoHideConfig, DefaultAutoHideConfig,
AutoHideCloseButtonCollapsesDock,
}; };
typedef QFlags<ads::CDockManager::eAutoHideFlag> AutoHideFlags; typedef QFlags<ads::CDockManager::eAutoHideFlag> AutoHideFlags;
@@ -237,6 +238,7 @@ public:
QMenu* viewMenu() const; QMenu* viewMenu() const;
void setViewMenuInsertionOrder(ads::CDockManager::eViewMenuInsertionOrder Order); void setViewMenuInsertionOrder(ads::CDockManager::eViewMenuInsertionOrder Order);
bool isRestoringState() const; bool isRestoringState() const;
bool isLeavingMinimizedState() const;
static int startDragDistance(); static int startDragDistance();
ads::CDockWidget* focusedDockWidget() const; ads::CDockWidget* focusedDockWidget() const;
QList<int> splitterSizes(ads::CDockAreaWidget *ContainedArea) const; QList<int> splitterSizes(ads::CDockAreaWidget *ContainedArea) const;
@@ -245,6 +247,7 @@ public:
static QString floatingContainersTitle(); static QString floatingContainersTitle();
public slots: public slots:
void endLeavingMinimizedState();
void openPerspective(const QString& PerspectiveName); void openPerspective(const QString& PerspectiveName);
void setDockWidgetFocused(ads::CDockWidget* DockWidget); void setDockWidgetFocused(ads::CDockWidget* DockWidget);

View File

@@ -60,7 +60,9 @@ public:
enum eMinimumSizeHintMode enum eMinimumSizeHintMode
{ {
MinimumSizeHintFromDockWidget, MinimumSizeHintFromDockWidget,
MinimumSizeHintFromContent MinimumSizeHintFromContent,
MinimumSizeHintFromDockWidgetMinimumSize,
MinimumSizeHintFromContentMinimumSize,
}; };
enum eToggleViewActionMode enum eToggleViewActionMode
@@ -94,6 +96,7 @@ public:
QAction* toggleViewAction() const; QAction* toggleViewAction() const;
void setToggleViewActionMode(ads::CDockWidget::eToggleViewActionMode Mode); void setToggleViewActionMode(ads::CDockWidget::eToggleViewActionMode Mode);
void setMinimumSizeHintMode(ads::CDockWidget::eMinimumSizeHintMode Mode); void setMinimumSizeHintMode(ads::CDockWidget::eMinimumSizeHintMode Mode);
ads::CDockWidget::eMinimumSizeHintMode minimumSizeHintMode() const;
bool isCentralWidget() const; bool isCentralWidget() const;
void setIcon(const QIcon& Icon); void setIcon(const QIcon& Icon);
QIcon icon() const; QIcon icon() const;

View File

@@ -37,6 +37,7 @@ public:
void updateStyle(); void updateStyle();
QSize iconSize() const; QSize iconSize() const;
void setIconSize(const QSize& Size); void setIconSize(const QSize& Size);
bool mousePressed() const;
public slots: public slots:
virtual void setVisible(bool visible); virtual void setVisible(bool visible);

View File

@@ -103,13 +103,6 @@ protected:
*/ */
CAutoHideDockContainer* createAndSetupAutoHideContainer(SideBarLocation area, CDockWidget* DockWidget, int TabIndex = -1); CAutoHideDockContainer* createAndSetupAutoHideContainer(SideBarLocation area, CDockWidget* DockWidget, int TabIndex = -1);
/**
* The funtion does the same like createAndSetupAutoHideContainer() but checks
* if the given DockWidget is pinnable. If it is not pinnable, the
* function returns a nullptr.
*/
CAutoHideDockContainer* createAutoHideContainerIfPinnable(SideBarLocation area, CDockWidget* DockWidget);
/** /**
* Helper function for creation of the root splitter * Helper function for creation of the root splitter
*/ */

View File

@@ -79,7 +79,6 @@ struct DockWidgetTabPrivate
QSpacerItem* IconTextSpacer; QSpacerItem* IconTextSpacer;
QPoint TabDragStartPosition; QPoint TabDragStartPosition;
QSize IconSize; QSize IconSize;
bool MousePressed = false;
/** /**
* Private data constructor * Private data constructor
@@ -373,7 +372,6 @@ void CDockWidgetTab::mousePressEvent(QMouseEvent* ev)
if (ev->button() == Qt::LeftButton) if (ev->button() == Qt::LeftButton)
{ {
ev->accept(); ev->accept();
d->MousePressed = true;
d->saveDragStartMousePosition(internal::globalPositionOf(ev)); d->saveDragStartMousePosition(internal::globalPositionOf(ev));
d->DragState = DraggingMousePressed; d->DragState = DraggingMousePressed;
if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting)) if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
@@ -394,7 +392,6 @@ void CDockWidgetTab::mouseReleaseEvent(QMouseEvent* ev)
{ {
if (ev->button() == Qt::LeftButton) if (ev->button() == Qt::LeftButton)
{ {
d->MousePressed = false;
auto CurrentDragState = d->DragState; auto CurrentDragState = d->DragState;
d->GlobalDragStartMousePosition = QPoint(); d->GlobalDragStartMousePosition = QPoint();
d->DragStartMousePosition = QPoint(); d->DragStartMousePosition = QPoint();

View File

@@ -178,12 +178,6 @@ public:
*/ */
void setIconSize(const QSize& Size); void setIconSize(const QSize& Size);
/**
* Returns true, if the tab has been clicked and the mouse is currently
* pressed.
*/
bool mousePressed() const;
public Q_SLOTS: public Q_SLOTS:
virtual void setVisible(bool visible) override; virtual void setVisible(bool visible) override;