forked from qt-creator/qt-creator
ADS: Integrate newest base repository commits
* Update to newest version of ADS * Remove native window and title bar support on linux Base repository was merged until commit 8d4507e9d83434be976ff8c7bc9f59733937a08d Task-number: QDS-10242 Change-Id: If74b6b50421be3b759c61b0f76f4a330991f71fa Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Henning Gruendl
committed by
Henning Gründl
Henning Gründl
parent
21983a8377
commit
16ef838f23
@@ -8,7 +8,7 @@
|
||||
#include <QDockWidget>
|
||||
#include <QRubberBand>
|
||||
|
||||
#ifdef Q_OS_LINUX
|
||||
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
|
||||
using FloatingWidgetBaseType = QDockWidget;
|
||||
#else
|
||||
using FloatingWidgetBaseType = QWidget;
|
||||
@@ -33,8 +33,8 @@ class DockingStateReader;
|
||||
|
||||
/**
|
||||
* Pure virtual interface for floating widgets.
|
||||
* This interface is used for opaque and non-opaque undocking. If opaque
|
||||
* undocking is used, the a real FloatingDockContainer widget will be created
|
||||
* This interface is used for opaque and non-opaque undocking. If opaque undocking is used,
|
||||
* the a real FloatingDockContainer widget will be created.
|
||||
*/
|
||||
class AbstractFloatingWidget
|
||||
{
|
||||
@@ -42,8 +42,7 @@ public:
|
||||
virtual ~AbstractFloatingWidget() = 0;
|
||||
/**
|
||||
* Starts floating.
|
||||
* This function should get called typically from a mouse press event
|
||||
* handler
|
||||
* This function should get called typically from a mouse press event handler.
|
||||
*/
|
||||
virtual void startFloating(const QPoint &dragStartMousePos,
|
||||
const QSize &size,
|
||||
@@ -52,26 +51,23 @@ public:
|
||||
= 0;
|
||||
|
||||
/**
|
||||
* Moves the widget to a new position relative to the position given when
|
||||
* startFloating() was called.
|
||||
* This function should be called from a mouse mouve event handler to
|
||||
* move the floating widget on mouse move events.
|
||||
* Moves the widget to a new position relative to the position given when startFloating()
|
||||
* was called. This function should be called from a mouse mouve event handler to move the
|
||||
* floating widget on mouse move events.
|
||||
*/
|
||||
virtual void moveFloating() = 0;
|
||||
|
||||
/**
|
||||
* Tells the widget that to finish dragging if the mouse is released.
|
||||
* This function should be called from a mouse release event handler
|
||||
* to finish the dragging
|
||||
* Tells the widget that to finish dragging if the mouse is released. This function should be
|
||||
* called from a mouse release event handler to finish the dragging.
|
||||
*/
|
||||
virtual void finishDragging() = 0;
|
||||
};
|
||||
|
||||
/**
|
||||
* This implements a floating widget that is a dock container that accepts
|
||||
* docking of dock widgets like the main window and that can be docked into
|
||||
* another dock container.
|
||||
* Every floating window of the docking system is a FloatingDockContainer.
|
||||
* This implements a floating widget that is a dock container that accepts docking of dock widgets
|
||||
* like the main window and that can be docked into another dock container. Every floating window
|
||||
* of the docking system is a FloatingDockContainer.
|
||||
*/
|
||||
class ADS_EXPORT FloatingDockContainer : public FloatingWidgetBaseType,
|
||||
public AbstractFloatingWidget
|
||||
@@ -96,9 +92,8 @@ private:
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Starts floating at the given global position.
|
||||
* Use moveToGlobalPos() to move the widget to a new position
|
||||
* depending on the start position given in Pos parameter
|
||||
* Starts floating at the given global position. Use moveToGlobalPos() to move the widget
|
||||
* to a new position depending on the start position given in Pos parameter.
|
||||
*/
|
||||
void startFloating(const QPoint &dragStartMousePos,
|
||||
const QSize &size,
|
||||
@@ -106,7 +101,7 @@ protected:
|
||||
QWidget *mouseEventHandler) override;
|
||||
|
||||
/**
|
||||
* Call this function to start dragging the floating widget
|
||||
* Call this function to start dragging the floating widget.
|
||||
*/
|
||||
void startDragging(const QPoint &dragStartMousePos,
|
||||
const QSize &size,
|
||||
@@ -116,14 +111,13 @@ protected:
|
||||
}
|
||||
|
||||
/**
|
||||
* Call this function if you explicitly want to signal that dragging has
|
||||
* finished
|
||||
* Call this function if you explicitly want to signal that dragging has finished.
|
||||
*/
|
||||
void finishDragging() override;
|
||||
|
||||
/**
|
||||
* Call this function if you just want to initialize the position
|
||||
* and size of the floating widget
|
||||
* Call this function if you just want to initialize the position and size of the
|
||||
* floating widget.
|
||||
*/
|
||||
void initFloatingGeometry(const QPoint &dragStartMousePos, const QSize &size)
|
||||
{
|
||||
@@ -131,21 +125,20 @@ protected:
|
||||
}
|
||||
|
||||
/**
|
||||
* Moves the widget to a new position relative to the position given when
|
||||
* startFloating() was called
|
||||
* Moves the widget to a new position relative to the position given when startFloating()
|
||||
* was called.
|
||||
*/
|
||||
void moveFloating() override;
|
||||
|
||||
/**
|
||||
* Restores the state from given stream.
|
||||
* If Testing is true, the function only parses the data from the given
|
||||
* stream but does not restore anything. You can use this check for
|
||||
* faulty files before you start restoring the state
|
||||
* Restores the state from given stream. If Testing is true, the function only parses the
|
||||
* data from the given stream but does not restore anything. You can use this check for
|
||||
* faulty files before you start restoring the state.
|
||||
*/
|
||||
bool restoreState(DockingStateReader &stream, bool testing);
|
||||
|
||||
/**
|
||||
* Call this function to update the window title
|
||||
* Call this function to update the window title.
|
||||
*/
|
||||
void updateWindowTitle();
|
||||
|
||||
@@ -158,6 +151,10 @@ protected: // reimplements QWidget
|
||||
#ifdef Q_OS_MACOS
|
||||
virtual bool event(QEvent *event) override;
|
||||
virtual void moveEvent(QMoveEvent *event) override;
|
||||
#elif defined(Q_OS_UNIX)
|
||||
virtual bool event(QEvent *e) override;
|
||||
virtual void moveEvent(QMoveEvent *event) override;
|
||||
virtual void resizeEvent(QResizeEvent *event) override;
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
@@ -202,26 +199,61 @@ public:
|
||||
bool isClosable() const;
|
||||
|
||||
/**
|
||||
* This function returns true, if this floating widget has only one single
|
||||
* visible dock widget in a single visible dock area.
|
||||
* The single dock widget is a real top level floating widget because no
|
||||
* other widgets are docked.
|
||||
* This function returns true, if this floating widget has only one single visible dock widget
|
||||
* in a single visible dock area. The single dock widget is a real top level floating widget
|
||||
* because no other widgets are docked.
|
||||
*/
|
||||
bool hasTopLevelDockWidget() const;
|
||||
|
||||
/**
|
||||
* This function returns the first dock widget in the first dock area.
|
||||
* If the function hasSingleDockWidget() returns true, then this function
|
||||
* returns this single dock widget.
|
||||
* This function returns the first dock widget in the first dock area. If the function
|
||||
* hasSingleDockWidget() returns true, then this function returns this single dock widget.
|
||||
*/
|
||||
DockWidget *topLevelDockWidget() const;
|
||||
|
||||
/**
|
||||
* This function returns a list of all dock widget in this floating widget.
|
||||
* This is a simple convenience function that simply calls the dockWidgets()
|
||||
* function of the internal container widget.
|
||||
* This function returns a list of all dock widget in this floating widget. This is a simple
|
||||
* convenience function that simply calls the dockWidgets() function of the internal
|
||||
* container widget.
|
||||
*/
|
||||
QList<DockWidget *> dockWidgets() const;
|
||||
|
||||
/**
|
||||
* This function hides the floating bar instantely and delete it later.
|
||||
*/
|
||||
void hideAndDeleteLater();
|
||||
|
||||
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
|
||||
/**
|
||||
* This is a function that responds to FloatingWidgetTitleBar::maximizeRequest()
|
||||
* Maximize or normalize the container size.
|
||||
*/
|
||||
void onMaximizeRequest();
|
||||
|
||||
/**
|
||||
* Normalize (Unmaximize) the window.
|
||||
* fixGeometry parameter fixes a "bug" in QT where immediately after calling showNormal
|
||||
* geometry is not set properly.
|
||||
* Set this true when moving the window immediately after normalizing.
|
||||
*/
|
||||
void showNormal(bool fixGeometry = false);
|
||||
|
||||
/**
|
||||
* Maximizes the window.
|
||||
*/
|
||||
void showMaximized();
|
||||
|
||||
/**
|
||||
* Returns if the window is currently maximized or not.
|
||||
*/
|
||||
bool isMaximized() const;
|
||||
|
||||
/**
|
||||
* Returns true if the floating widget has a native titlebar or false if
|
||||
* the floating widget has a QWidget based title bar
|
||||
*/
|
||||
bool hasNativeTitleBar();
|
||||
#endif
|
||||
}; // class FloatingDockContainer
|
||||
|
||||
} // namespace ADS
|
||||
|
||||
Reference in New Issue
Block a user